diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index f12adb1..efe2720 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -145,8 +145,14 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
         RectangleMapObject rectangleObject = objects.getByType(RectangleMapObject.class).get(0);
         
         Rectangle rectangle = rectangleObject.getRectangle();
-        if(Intersector.overlaps(rectangle, m.getPlayer().getBoundingRectangle())){
-            d.getPlayer().update();
+        
+        float x = d.getPlayer().getxPos();
+        float y = d.getPlayer().getyPos();
+        
+        d.getPlayer().update();
+        if(!Intersector.overlaps(rectangle, m.getPlayer().getBoundingRectangle())){
+            d.getPlayer().setxPos(x);
+            d.getPlayer().setyPos(y);
         }
     }
     
diff --git a/core/src/com/dungeoncrawler/view/MapGenerator.java b/core/src/com/dungeoncrawler/view/MapGenerator.java
index e0ce3e6..d046fcc 100644
--- a/core/src/com/dungeoncrawler/view/MapGenerator.java
+++ b/core/src/com/dungeoncrawler/view/MapGenerator.java
@@ -139,7 +139,7 @@ public class MapGenerator {
             }
         }
         
-        RectangleMapObject collision = new RectangleMapObject(48, 48, roomDimensionX, roomDimensionY);
+        RectangleMapObject collision = new RectangleMapObject(48, 48, roomDimensionX*48, roomDimensionY*48);
         collisionLayer.getObjects().add(collision);
         
         collisionLayer.setVisible(false);