diff --git a/SPD-classes/src/main/java/com/watabou/noosa/Tilemap.java b/SPD-classes/src/main/java/com/watabou/noosa/Tilemap.java
index c77389f77..10d3c343b 100644
--- a/SPD-classes/src/main/java/com/watabou/noosa/Tilemap.java
+++ b/SPD-classes/src/main/java/com/watabou/noosa/Tilemap.java
@@ -241,7 +241,7 @@ public class Tilemap extends Visual {
 				topLeft++;
 
 			bottomRight = Math.min(camX+camW, mapWidth-1)
-					+ Math.min((camY+camH)*mapWidth, mapHeight*(mapWidth-1));
+					+ Math.min((camY+camH)*mapWidth, (mapHeight-1)*mapWidth);
 			while(bufferPositions[bottomRight] == -1)
 				bottomRight--;