diff --git a/Source/Game/Console/ConsolePlugin.cs b/Source/Game/Console/ConsolePlugin.cs
index 1b8b874..2879c72 100644
--- a/Source/Game/Console/ConsolePlugin.cs
+++ b/Source/Game/Console/ConsolePlugin.cs
@@ -51,7 +51,7 @@ namespace Game
             //GameMode.Connect();
             //GameMode.StartServer(true);
             //NetworkManager.StartServer();
-            GameModeManager.Init();
+            //GameModeManager.Init();
             NetworkManager.ConnectServer();
 #endif
         }
diff --git a/Source/Game/GameMode/GameModeManager_old.cs b/Source/Game/GameMode/GameModeManager_old.cs
index 165a830..007c6d6 100644
--- a/Source/Game/GameMode/GameModeManager_old.cs
+++ b/Source/Game/GameMode/GameModeManager_old.cs
@@ -402,7 +402,7 @@ namespace Game
                     //Assert.IsTrue(reportedFrame >= lastReceivedServerFrame);
                     if (reportedPlayerId == NetworkManager.LocalPlayerClientId && reportedFrame < lastReceivedServerFrame)
                     {
-                        Console.Print($"packet wrong order, received {lastReceivedServerFrame}, new {reportedFrame}");
+                        Console.Print($"packet wrong order, last received: {lastReceivedServerFrame}, new: {reportedFrame}");
                         break;
                     }
                     
diff --git a/Source/Game/GameMode/NetworkManager.cs b/Source/Game/GameMode/NetworkManager.cs
index 92d6738..ce93f76 100644
--- a/Source/Game/GameMode/NetworkManager.cs
+++ b/Source/Game/GameMode/NetworkManager.cs
@@ -103,8 +103,9 @@ namespace Game
 
 #if FLAX_EDITOR
             Editor.Instance.PlayModeEnd -= Cleanup;
-            GameModeManager.Cleanup(); // FIXME
+            //GameModeManager.Cleanup(); // FIXME
 #endif
+            GameModeManager.Cleanup(); // FIXME
 
             initialized = false;
         }
diff --git a/Source/Game/GameMode/NetworkManager_Client.cs b/Source/Game/GameMode/NetworkManager_Client.cs
index b929147..f720974 100644
--- a/Source/Game/GameMode/NetworkManager_Client.cs
+++ b/Source/Game/GameMode/NetworkManager_Client.cs
@@ -16,7 +16,10 @@ namespace Game
         public static bool ConnectServer(string serverAddress = "localhost", bool listenServer = false)
         {
             if (!listenServer)
+            {
                 Cleanup();
+                GameModeManager.Init();
+            }
             ServerAddress = serverAddress;
 
             //var driver = Object.New(typeof(ENetDriver));
diff --git a/Source/Game/GameMode/NetworkManager_Server.cs b/Source/Game/GameMode/NetworkManager_Server.cs
index f28c53a..6fcd3e4 100644
--- a/Source/Game/GameMode/NetworkManager_Server.cs
+++ b/Source/Game/GameMode/NetworkManager_Server.cs
@@ -19,6 +19,7 @@ namespace Game
 
         public static bool StartServer(bool listenServer = true)
         {
+            Cleanup();
             ConnectedClients = new List<NetworkConnection>(MaximumClients);
 
 
@@ -78,6 +79,7 @@ namespace Game
             foreach (Type type in NetworkedTypes)
                 Console.Print("tracking networked type: " + type.Name);
 #endif
+            GameModeManager.Init();
 
             if (listenServer)
                 return ConnectServer(listenServer: true);