diff --git a/data/editor/front.png b/data/editor/front.png
index f4a625bb1..203cd6fe0 100644
Binary files a/data/editor/front.png and b/data/editor/front.png differ
diff --git a/src/game/gamecore.cpp b/src/game/gamecore.cpp
index a880b91a8..6958bdaaf 100644
--- a/src/game/gamecore.cpp
+++ b/src/game/gamecore.cpp
@@ -64,6 +64,8 @@ void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore
 
 	m_pTeams = pTeams;
 	m_Id = -1;
+	m_Hook = true;
+	m_Collision = true;
 }
 
 void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore* pTeams, std::map<int, std::vector<vec2> > pTeleOuts)
@@ -74,6 +76,8 @@ void CCharacterCore::Init(CWorldCore *pWorld, CCollision *pCollision, CTeamsCore
 
 	m_pTeams = pTeams;
 	m_Id = -1;
+	m_Hook = true;
+	m_Collision = true;
 }
 
 void CCharacterCore::Reset()
@@ -88,6 +92,8 @@ void CCharacterCore::Reset()
 	m_HookedPlayer = -1;
 	m_Jumped = 0;
 	m_TriggeredEvents = 0;
+	m_Hook = true;
+	m_Collision = true;
 }
 
 void CCharacterCore::Tick(bool UseInput)
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
index 62af13fef..68e866ff9 100644
--- a/src/game/server/entities/character.cpp
+++ b/src/game/server/entities/character.cpp
@@ -1683,7 +1683,5 @@ void CCharacter::DDRaceInit()
 	m_TeleCheckpoint = 0;
 	m_EndlessHook = g_Config.m_SvEndlessDrag;
 	m_Hit = g_Config.m_SvHit ? HIT_ALL : DISABLE_HIT_GRENADE|DISABLE_HIT_HAMMER|DISABLE_HIT_RIFLE|DISABLE_HIT_SHOTGUN;
-	m_Core.m_Collision = true;
-	m_Core.m_Hook = true;
 	m_SuperJump = false;
 }