diff --git a/logic/Gaming/CharacterManager .cs b/logic/Gaming/CharacterManager .cs
index 7f15d59..9f4b984 100644
--- a/logic/Gaming/CharacterManager .cs	
+++ b/logic/Gaming/CharacterManager .cs	
@@ -398,10 +398,8 @@ namespace Gaming
                         ((SummonGolem)(((Golem)player).Parent.FindIActiveSkill(ActiveSkillType.SummonGolem))).GolemSummoned = null;
                         player.FindIActiveSkill(ActiveSkillType.UseRobot).IsBeingUsed = false;
                     }
-                    gameMap.Remove(player);
                     return;
                 }
-                gameMap.Remove(player);
                 ++gameMap.NumOfDeceasedStudent;
             }