diff --git a/sti/init.lua b/sti/init.lua
index 9214112..be821e5 100644
--- a/sti/init.lua
+++ b/sti/init.lua
@@ -499,9 +499,9 @@ function Map:set_batches(layer, chunk)
 		layer.batches = {}
 	end
 
+	local offsetX = chunk and chunk.x or 0
+	local offsetY = chunk and chunk.y or 0
 	if self.orientation == "orthogonal" or self.orientation == "isometric" then
-		local offsetX = chunk and chunk.x or 0
-		local offsetY = chunk and chunk.y or 0
 
 		local startX     = 1
 		local startY     = 1
@@ -549,7 +549,7 @@ function Map:set_batches(layer, chunk)
 					end
 
 					if tile then
-						self:addNewLayerTile(layer, chunk, tile, x, y)
+						self:addNewLayerTile(layer, chunk, tile, x + offsetX, y + offsetY)
 					end
 				end
 			end
@@ -579,7 +579,7 @@ function Map:set_batches(layer, chunk)
 						end
 
 						if tile then
-							self:addNewLayerTile(layer, chunk, tile, x, y)
+							self:addNewLayerTile(layer, chunk, tile, x + ofsetX, y + offsetY)
 						end
 					end