diff --git a/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java b/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java
index d3978d8..dab7429 100644
--- a/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java
+++ b/Emulator/src/main/java/com/eu/habbo/habbohotel/rooms/RoomTile.java
@@ -205,8 +205,11 @@ public class RoomTile {
     }
 
     public boolean hasUnits() {
-        synchronized (this.units) {
-            return this.units.size() > 0;
+        synchronized(this.units) {
+            if (!this.units.isEmpty()) {
+                this.units.removeIf(unit -> !unit.getCurrentLocation().equals(this));
+            }
+            return !this.units.isEmpty();
         }
     }
 
diff --git a/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar b/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar
index afd8715..2c4e3a1 100644
Binary files a/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar and b/Latest_Compiled_Version/Habbo-3.6.0-jar-with-dependencies.jar differ