diff --git a/src/main/java/com/replaymod/core/LoadingPlugin.java b/src/main/java/com/replaymod/core/LoadingPlugin.java
index a15b9c96..b2a9e0ac 100755
--- a/src/main/java/com/replaymod/core/LoadingPlugin.java
+++ b/src/main/java/com/replaymod/core/LoadingPlugin.java
@@ -8,6 +8,8 @@ import org.spongepowered.asm.mixin.Mixins;
 import net.minecraftforge.fml.relauncher.CoreModManager;
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
 //#else
+//$$ import com.replaymod.core.asm.GLErrorTransformer;
+//$$ import com.replaymod.core.asm.GLStateTrackerTransformer;
 //$$ import cpw.mods.fml.relauncher.CoreModManager;
 //$$ import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 //$$
@@ -21,6 +23,7 @@ import java.net.URL;
 import java.security.CodeSource;
 import java.util.Map;
 
+@IFMLLoadingPlugin.TransformerExclusions("com.replaymod.core.asm.")
 public class LoadingPlugin implements IFMLLoadingPlugin {
 
     public LoadingPlugin() {
diff --git a/src/main/java/com/replaymod/core/GLErrorTransformer.java b/src/main/java/com/replaymod/core/asm/GLErrorTransformer.java
similarity index 96%
rename from src/main/java/com/replaymod/core/GLErrorTransformer.java
rename to src/main/java/com/replaymod/core/asm/GLErrorTransformer.java
index 91dc3c46..dac9dde9 100644
--- a/src/main/java/com/replaymod/core/GLErrorTransformer.java
+++ b/src/main/java/com/replaymod/core/asm/GLErrorTransformer.java
@@ -1,5 +1,5 @@
 //#if MC<=10710
-//$$ package com.replaymod.core;
+//$$ package com.replaymod.core.asm;
 //$$
 //$$ import net.minecraft.launchwrapper.IClassTransformer;
 //$$ import org.lwjgl.opengl.GL11;
@@ -25,8 +25,7 @@
 //$$
 //$$     @Override
 //$$     public byte[] transform(String name, String transformedName, byte[] basicClass) {
-//$$         // Ignore (anonymous) inner classes of this transformer
-//$$         if (name.startsWith(GLErrorTransformer_CLASS)) return basicClass;
+//$$         if (basicClass == null) return null;
 //$$
 //$$         ClassReader reader = new ClassReader(basicClass);
 //$$         ClassWriter writer = new ClassWriter(reader, 0);
diff --git a/src/main/java/com/replaymod/core/GLStateTrackerTransformer.java b/src/main/java/com/replaymod/core/asm/GLStateTrackerTransformer.java
similarity index 96%
rename from src/main/java/com/replaymod/core/GLStateTrackerTransformer.java
rename to src/main/java/com/replaymod/core/asm/GLStateTrackerTransformer.java
index 47910f13..26129095 100644
--- a/src/main/java/com/replaymod/core/GLStateTrackerTransformer.java
+++ b/src/main/java/com/replaymod/core/asm/GLStateTrackerTransformer.java
@@ -1,5 +1,5 @@
 //#if MC<=10710
-//$$ package com.replaymod.core;
+//$$ package com.replaymod.core.asm;
 //$$
 //$$ import net.minecraft.launchwrapper.IClassTransformer;
 //$$ import org.objectweb.asm.ClassReader;
@@ -26,8 +26,7 @@
 //$$
 //$$     @Override
 //$$     public byte[] transform(String name, String transformedName, byte[] basicClass) {
-//$$         // Ignore (anonymous) inner classes of this transformer
-//$$         if (name.startsWith(GLStateTrackerTransformer.class.getName())) return basicClass;
+//$$         if (basicClass == null) return null;
 //$$         // Ignore the state tracker itself
 //$$         if (name.equals(GLStateTracker_CLASS)) return basicClass;
 //$$