diff --git a/src/main/java/ftbsc/lll/processor/tools/containers/ClassContainer.java b/src/main/java/ftbsc/lll/processor/tools/containers/ClassContainer.java
index 7251aa6..f232b00 100644
--- a/src/main/java/ftbsc/lll/processor/tools/containers/ClassContainer.java
+++ b/src/main/java/ftbsc/lll/processor/tools/containers/ClassContainer.java
@@ -84,7 +84,7 @@ public class ClassContainer {
 			}
 			this.fqn = newFQN.toString();
 		} else this.fqn = fqn;
-		this.fqnObf = findClassName(fqn, mapper);
+		this.fqnObf = findClassName(this.fqn, mapper);
 		this.elem = elem;
 	}
 
diff --git a/src/main/java/ftbsc/lll/processor/tools/containers/FieldContainer.java b/src/main/java/ftbsc/lll/processor/tools/containers/FieldContainer.java
index 555f113..23cd0c6 100644
--- a/src/main/java/ftbsc/lll/processor/tools/containers/FieldContainer.java
+++ b/src/main/java/ftbsc/lll/processor/tools/containers/FieldContainer.java
@@ -87,7 +87,7 @@ public class FieldContainer {
 		Find f = finder.getAnnotation(Find.class);
 
 		ClassContainer parent = ClassContainer.findOrFallback(
-			ClassContainer.from(patchAnn, Patch::value, patchAnn.className(), env, null),
+			ClassContainer.from(patchAnn, Patch::value, patchAnn.className(), env, mapper),
 			f, env, mapper
 		);
 
diff --git a/src/main/java/ftbsc/lll/processor/tools/containers/MethodContainer.java b/src/main/java/ftbsc/lll/processor/tools/containers/MethodContainer.java
index fd08028..8b54a93 100644
--- a/src/main/java/ftbsc/lll/processor/tools/containers/MethodContainer.java
+++ b/src/main/java/ftbsc/lll/processor/tools/containers/MethodContainer.java
@@ -92,7 +92,7 @@ public class MethodContainer {
 		//the parent always has a @Patch annotation
 		Patch patchAnn = stub.getEnclosingElement().getAnnotation(Patch.class);
 		ClassContainer parent = ClassContainer.findOrFallback(
-			ClassContainer.from(patchAnn, Patch::value, patchAnn.className(), env, null),
+			ClassContainer.from(patchAnn, Patch::value, patchAnn.className(), env, mapper),
 			f, env, mapper
 		);