diff --git a/src/main/java/org/ultramine/server/asm/UMTBatchTransformer.java b/src/main/java/org/ultramine/server/asm/UMTBatchTransformer.java
index 24cb3ca..e1fd3a1 100644
--- a/src/main/java/org/ultramine/server/asm/UMTBatchTransformer.java
+++ b/src/main/java/org/ultramine/server/asm/UMTBatchTransformer.java
@@ -15,6 +15,7 @@
 
 public class UMTBatchTransformer implements IClassTransformer
 {
+	private static final boolean REPAIR_FRAMES = Boolean.parseBoolean(System.getProperty("org.ultramine.core.asm.repairJavaClassFrames", "true"));
 	private List<IUMClassTransformer> globalTransformers = new ArrayList<>();
 	private Map<String, List<IUMClassTransformer>> specialTransformers = new HashMap<>();
 
@@ -50,7 +51,7 @@
 			flags |= transformer.transform(name, transformedName, classReader, classNode).ordinal();
 
 		// Computing frames even if we did not changed class to fix other mod changes of 1.7 & 1.8 classes
-		boolean shouldComputeFrames = (classNode.version & 0xFFFF) > Opcodes.V1_6;
+		boolean shouldComputeFrames = REPAIR_FRAMES && (classNode.version & 0xFFFF) > Opcodes.V1_6;
 		if(flags == 0 && !shouldComputeFrames)
 			return basicClass;