diff --git a/src/engine/devcmd/cmds/AddNPCCmd.java b/src/engine/devcmd/cmds/AddNPCCmd.java
index 4c3cd4a8..2883a39f 100644
--- a/src/engine/devcmd/cmds/AddNPCCmd.java
+++ b/src/engine/devcmd/cmds/AddNPCCmd.java
@@ -78,10 +78,14 @@ public class AddNPCCmd extends AbstractDevCmd {
             }
         NPC created;
         Guild guild = null;
+        Vector3fImmutable loc;
         if(building != null){
             guild = building.getGuild();
+            loc = building.loc;
+        } else{
+            loc = pc.loc;
         }
-        created = NPC.createNPC(name, contractID, Vector3fImmutable.ZERO, guild, zone, (short)level, building);
+        created = NPC.createNPC(name, contractID, loc, guild, zone, (short)level, building);
         if(building != null) {
         created.buildingUUID = building.getObjectUUID();
         created.building = building;