diff --git a/LaunchServer/source/response/ResponseThread.java b/LaunchServer/source/response/ResponseThread.java
index 6b4bd50..8baeeb3 100644
--- a/LaunchServer/source/response/ResponseThread.java
+++ b/LaunchServer/source/response/ResponseThread.java
@@ -95,7 +95,6 @@
 		Request.Type type = Request.Type.read(input);
 		if (!server.serverSocketHandler.onHandshake(id, type)) {
 			output.writeBoolean(false);
-			output.flush();
 			return null;
 		}
 
diff --git a/Launcher/source/Launcher.java b/Launcher/source/Launcher.java
index 6738903..42e2671 100644
--- a/Launcher/source/Launcher.java
+++ b/Launcher/source/Launcher.java
@@ -72,7 +72,7 @@
 	// Version info
 	@LauncherAPI public static final String VERSION = "15.0";
 	@LauncherAPI public static final String BUILD = readBuildNumber();
-	@LauncherAPI public static final int PROTOCOL_MAGIC = 0x724724_15;
+	@LauncherAPI public static final int PROTOCOL_MAGIC = 0x724724_16;
 
 	// Constants
 	@LauncherAPI public static final String RUNTIME_DIR = "runtime";
diff --git a/Launcher/source/request/Request.java b/Launcher/source/request/Request.java
index fe64518..5f2e59d 100644
--- a/Launcher/source/request/Request.java
+++ b/Launcher/source/request/Request.java
@@ -42,10 +42,6 @@
 			try (HInput input = new HInput(socket.getInputStream());
 				 HOutput output = new HOutput(socket.getOutputStream())) {
 				writeHandshake(input, output);
-
-				// Start request
-				EnumSerializer.write(output, getType());
-				output.flush();
 				return requestDo(input, output);
 			}
 		}
@@ -63,10 +59,10 @@
 	protected abstract R requestDo(HInput input, HOutput output) throws Exception;
 
 	private void writeHandshake(HInput input, HOutput output) throws IOException {
+		// Write handshake
 		output.writeInt(Launcher.PROTOCOL_MAGIC);
-
-		// Write key info
 		output.writeBigInteger(config.publicKey.getModulus(), SecurityHelper.RSA_KEY_LENGTH + 1);
+		EnumSerializer.write(output, getType());
 		output.flush();
 
 		// Verify is accepted