diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomLayout.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomLayout.java
index 2f2b5fdb..5236e11b 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomLayout.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomLayout.java
@@ -612,6 +612,11 @@ public class RoomLayout {
                         }
                     }
                 }
+            } else if (rotation == 1 || rotation == 3 || rotation == 5 || rotation == 7) {
+                RoomTile t = this.getTile(tile.getX(), tile.getY());
+                if (t == null || t.getState() == RoomTileState.INVALID) {
+                    return false;
+                }
             }
         }
 
@@ -642,9 +647,13 @@ public class RoomLayout {
                         }
                     }
                 }
+            } else if (rotation == 1 || rotation == 3 || rotation == 5 || rotation == 7) {
+                RoomTile t = this.getTile(tile.getX(), tile.getY());
+                if (t != null) {
+                    pointList.add(t);
+                }
             }
         }
-
         return pointList;
     }
 }