diff --git a/app/libs/boardwalk_lwjgl_buffer.jar b/app/libs/boardwalk_lwjgl_buffer.jar
new file mode 100644
index 0000000000..91750f1f30
Binary files /dev/null and b/app/libs/boardwalk_lwjgl_buffer.jar differ
diff --git a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
index d434e90ec2..0c7ea11aa6 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
@@ -224,7 +224,8 @@ public void onClick(DialogInterface p1, int p2)
 			if (mVersionInfo.arguments == null) {
 				// Minecraft 1.12 and below
 				
-				SecondaryDexLoader.install(getClassLoader(), Arrays.asList(new File[]{new File(Tools.libraries + "/" + Tools.artifactToPath("org.lwjgl", "lwjglboardwalk", "2.9.1"))}), optDir);
+				// TODO uncomment after fix
+				// SecondaryDexLoader.install(getClassLoader(), Arrays.asList(new File[]{new File(Tools.libraries + "/" + Tools.artifactToPath("org.lwjgl", "lwjglboardwalk", "2.9.1"))}), optDir);
 			}
 			
 			this.displayMetrics = Tools.getDisplayMetrics(this);
diff --git a/app/src/main/java/net/kdt/pojavlaunch/SecondaryDexLoader.java b/app/src/main/java/net/kdt/pojavlaunch/SecondaryDexLoader.java
index aef1748615..8d12f402e1 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/SecondaryDexLoader.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/SecondaryDexLoader.java
@@ -140,5 +140,7 @@ public static void resetFieldArray(ClassLoader loader) throws Throwable {
 		
 		Field jlrField = findField(instance, "dexElements");
 		jlrField.set(instance, originalDex);
+		
+		originalDex = null;
 	}
 }