diff --git a/Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java b/Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java
index eb0f6aa9..36af51a6 100644
--- a/Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java
+++ b/Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java
@@ -15,6 +15,8 @@
 import java.util.List;
 
 public class ClientLauncherWrapper {
+	public static final String MAGIC_ARG = "-Djdk.attach.allowAttachSelf";
+	
     public static void main(String[] arguments) throws IOException, InterruptedException {
         LogHelper.printVersion("Launcher");
         LogHelper.printLicense("Launcher");
@@ -36,6 +38,8 @@ public static void main(String[] arguments) throws IOException, InterruptedExcep
         JVMHelper.addSystemPropertyToArgs(args, DirBridge.CUSTOMDIR_PROPERTY);
         JVMHelper.addSystemPropertyToArgs(args, DirBridge.USE_CUSTOMDIR_PROPERTY);
         JVMHelper.addSystemPropertyToArgs(args, DirBridge.USE_OPTDIR_PROPERTY);
+        Collections.addAll(args, MAGIC_ARG);
+        Collections.addAll(args, "-XX:+DisableAttachMechanism");
         Collections.addAll(args, "-javaagent:".concat(pathLauncher));
         Collections.addAll(args, "-cp");
         Collections.addAll(args, pathLauncher);
diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java b/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java
index 8cc2823f..354ed894 100644
--- a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java
+++ b/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java
@@ -366,6 +366,7 @@ public static Process launch(
         // Add classpath and main class
         String pathLauncher = IOHelper.getCodeSource(ClientLauncher.class).toString();
         context.pathLauncher = pathLauncher;
+        Collections.addAll(context.args, ClientLauncherWrapper.MAGIC_ARG);
         Collections.addAll(context.args, profile.getJvmArgs());
         profile.pushOptionalJvmArgs(context.args);
         Collections.addAll(context.args, "-Djava.library.path=".concat(params.clientDir.resolve(NATIVES_DIR).toString())); // Add Native Path
diff --git a/modules b/modules
index 27773ae6..e54a415b 160000
--- a/modules
+++ b/modules
@@ -1 +1 @@
-Subproject commit 27773ae6469dd745ba9fb6f18614c0bbe1e23374
+Subproject commit e54a415b629b2b1aba70c9b9669a8c1d3b9f2cf1