1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp
index 7f5557bd3ef..7c9beb7d656 100755
--- a/src/server/game/Globals/ObjectAccessor.cpp
+++ b/src/server/game/Globals/ObjectAccessor.cpp
@@ -199,10 +199,10 @@ void ObjectAccessor::RemoveCorpse(Corpse* corpse)
 {
     ASSERT(corpse && corpse->GetType() != CORPSE_BONES);
 
-    if (Map* map = corpse->FindMap())
+    if (corpse->IsInGrid())
     {
         corpse->DestroyForNearbyPlayers();
-        map->RemoveFromMap(corpse, false);
+        corpse->GetMap()->RemoveFromMap(corpse, false);
     }
     else
         corpse->RemoveFromWorld();