diff --git a/src/engine/gameManager/BuildingManager.java b/src/engine/gameManager/BuildingManager.java
index 29952642..0ced4674 100644
--- a/src/engine/gameManager/BuildingManager.java
+++ b/src/engine/gameManager/BuildingManager.java
@@ -571,8 +571,9 @@ public enum BuildingManager {
         if (npc == null)
             return false;
 
-        npc.setLoc(npc.getLoc());
-
+        npc.setObjectTypeMask(MBServerStatics.MASK_NPC);
+        npc.setLoc(npc.bindLoc);
+        InterestManager.setObjectDirty(npc);
         return true;
     }