diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java
index da895a12..5666f6b0 100644
--- a/src/engine/objects/Mob.java
+++ b/src/engine/objects/Mob.java
@@ -808,7 +808,7 @@ public class Mob extends AbstractIntelligenceAgent {
         // otherwise use the mob cache location.
 
         if (this.building != null && building.getBlueprintUUID() != 0
-            && this.building.getHirelings().contains(this) == false) {
+            && this.loadID == 0) {
 
             int maxSlots = 10;
 
diff --git a/src/engine/objects/NPC.java b/src/engine/objects/NPC.java
index b69f2bea..dd8b7f18 100644
--- a/src/engine/objects/NPC.java
+++ b/src/engine/objects/NPC.java
@@ -357,7 +357,7 @@ public class NPC extends AbstractCharacter {
 		// createMobWithNoID() is called.
 
 		if (this.building != null &&
-		    this.building.getHirelings().contains(this) == false) {
+		    this.loadID == 0) {
 
 			int maxSlots = 10;