diff --git a/src/main/java/net/fabricmc/tinyremapper/AsmClassRemapper.java b/src/main/java/net/fabricmc/tinyremapper/AsmClassRemapper.java
index cca49f5b..c624d1da 100644
--- a/src/main/java/net/fabricmc/tinyremapper/AsmClassRemapper.java
+++ b/src/main/java/net/fabricmc/tinyremapper/AsmClassRemapper.java
@@ -254,6 +254,14 @@ public void visitMethodInsn(int opcode, String owner, String name, String descri
 				PackageAccessChecker.checkMember(this.owner, owner, name, descriptor, TrMember.MemberType.METHOD, "method instruction", (AsmRemapper) remapper);
 			}
 
+			AsmRemapper asmRemapper = ((AsmRemapper) remapper);
+			for (ClassInstance checkClass = asmRemapper.getClass(owner); checkClass != null; checkClass = checkClass.getSuperClass()) {
+				if(checkClass.getMethod(name, descriptor) != null) {
+					owner = checkClass.getName();
+					break;
+				}
+			}
+
 			super.visitMethodInsn(opcode, owner, name, descriptor, isInterface);
 		}