diff --git a/src/com/massivecraft/massivecore/store/EntityInternalMap.java b/src/com/massivecraft/massivecore/store/EntityInternalMap.java
index 53cb1b02..aa6e6b90 100644
--- a/src/com/massivecraft/massivecore/store/EntityInternalMap.java
+++ b/src/com/massivecraft/massivecore/store/EntityInternalMap.java
@@ -175,7 +175,7 @@ public class EntityInternalMap<E extends EntityInternal<E>> extends EntityContai
 		
 		this.removeIdentifiedModificationFixed(id);
 		
-		E entity = this.getIdToEntity().remove(id);
+		E entity = this.getIdToEntityRaw().remove(id);
 		if (entity == null) return null;
 		
 		// Remove entity reference info