diff --git a/src/main/kotlin/xyz/bluspring/kilt/loader/remap/KiltRemapper.kt b/src/main/kotlin/xyz/bluspring/kilt/loader/remap/KiltRemapper.kt
index b638121..d55f9a9 100644
--- a/src/main/kotlin/xyz/bluspring/kilt/loader/remap/KiltRemapper.kt
+++ b/src/main/kotlin/xyz/bluspring/kilt/loader/remap/KiltRemapper.kt
@@ -97,13 +97,13 @@ object KiltRemapper {
     init {
         srgIntermediaryMapping.classes.forEach {
             it.methods.forEach m@{ f ->
-                val map = srgMappedMethods.computeIfAbsent(f.original) { mutableMapOf() }
-                val mapped = (mappingResolver.mapMethodName("intermediary", it.mapped.replace("/", "."), f.mapped, f.mappedDescriptor))
-
                 // otherwise FunctionalInterface methods don't get remapped properly???
-                if (!mapped.startsWith("method_"))
+                if (!f.mapped.startsWith("method_"))
                     return@m
 
+                val map = srgMappedMethods.computeIfAbsent(f.original) { mutableMapOf() }
+                val mapped = (mappingResolver.mapMethodName("intermediary", it.mapped.replace("/", "."), f.mapped, f.mappedDescriptor))
+
                 map[f.parent.original] = mapped
             }
         }