diff --git a/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java b/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java
index a1556111..6d131792 100644
--- a/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java
+++ b/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java
@@ -28,6 +28,7 @@
 import pro.gravit.utils.helper.LogHelper;
 
 public class LauncherEngine {
+	public static final AtomicBoolean IS_CLIENT = new AtomicBoolean(false);
 
     public static void main(String... args) throws Throwable {
         JVMHelper.checkStackTrace(LauncherEngine.class);
diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java
index 9173eecf..15e74934 100644
--- a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java
+++ b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java
@@ -443,13 +443,12 @@ public ClientLaunchContext(Params params, ClientProfile profile, HashedDir asset
 
     @LauncherAPI
     public static void main(String... args) throws Throwable {
+    	LauncherEngine.IS_CLIENT.set(true);
         LauncherEngine engine = LauncherEngine.clientInstance();
-        //Launcher.modulesManager = new ClientModuleManager(engine);
         LauncherEngine.modulesManager = new ClientModuleManager();
         LauncherConfig.getAutogenConfig().initModules(); //INIT
         LauncherEngine.modulesManager.initModules(null);
         initGson(LauncherEngine.modulesManager);
-        //Launcher.modulesManager.preInitModules();
         if (!LauncherAgent.isStarted()) {
         	NativeJVMHalt.haltA(100);
         	return;
diff --git a/modules b/modules
index 42f29101..a4cf6a2f 160000
--- a/modules
+++ b/modules
@@ -1 +1 @@
-Subproject commit 42f29101e441d85b15920b9657c447e08cf6af73
+Subproject commit a4cf6a2f71892f65ef6202d1c254a073f2d7ca6f