diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp
index 0599afb62..1bb11b4a1 100644
--- a/src/game/ObjectAccessor.cpp
+++ b/src/game/ObjectAccessor.cpp
@@ -47,7 +47,10 @@ ObjectAccessor::ObjectAccessor() {}
 ObjectAccessor::~ObjectAccessor()
 {
     for(Player2CorpsesMapType::const_iterator itr = i_player2corpse.begin(); itr != i_player2corpse.end(); ++itr)
+    {
+        itr->second->RemoveFromWorld();
         delete itr->second;
+    }
 }
 
 Unit*
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index a726dbc06..f8c7f0cc0 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8816"
+ #define REVISION_NR "8817"
 #endif // __REVISION_NR_H__