diff --git a/src/main/java/se/urmo/game/collision/CollisionChecker.java b/src/main/java/se/urmo/game/collision/CollisionChecker.java
index 639ee92..f94dab0 100644
--- a/src/main/java/se/urmo/game/collision/CollisionChecker.java
+++ b/src/main/java/se/urmo/game/collision/CollisionChecker.java
@@ -57,7 +57,7 @@ public class CollisionChecker {
         int x = pos.x;
         int y = pos.y;
         int width = GamePanel.SCREEN_WIDTH;
-        int height = map.getHeight();
+        int height = GamePanel.SCREEN_HEIGHT;
 
         // tunnel
         if (x < GameMap.OFFSET_X) x = width - agent_width/2 - GameMap.OFFSET_X;       // right
diff --git a/src/main/java/se/urmo/game/entities/ClydeStrategy.java b/src/main/java/se/urmo/game/entities/ClydeStrategy.java
index 7db2c14..781f43e 100644
--- a/src/main/java/se/urmo/game/entities/ClydeStrategy.java
+++ b/src/main/java/se/urmo/game/entities/ClydeStrategy.java
@@ -15,7 +15,7 @@ public class ClydeStrategy implements GhostStrategy {
         if (distance > 8) {
             return pacTile; // chase Pac-Man
         } else {
-            return new Point(0, map.getHeight() - 1); // retreat to corner
+            return new Point(0, GameMap.OFFSET_Y + (map.rows() * GameMap.MAP_TILESIZE)); // retreat to corner
         }
     }
 }
diff --git a/src/main/java/se/urmo/game/map/GameMap.java b/src/main/java/se/urmo/game/map/GameMap.java
index 9fc1c15..a0f24ae 100644
--- a/src/main/java/se/urmo/game/map/GameMap.java
+++ b/src/main/java/se/urmo/game/map/GameMap.java
@@ -200,4 +200,5 @@ public class GameMap {
     public int rows() {
         return mapData.length;
     }
+
 }