diff --git a/module/bukkit-nms/src/main/kotlin/taboolib/module/nms/remap/RemapTranslationUnobfsucated.kt b/module/bukkit-nms/src/main/kotlin/taboolib/module/nms/remap/RemapTranslationUnobfsucated.kt
index 5e2f91388..5b83e88d4 100644
--- a/module/bukkit-nms/src/main/kotlin/taboolib/module/nms/remap/RemapTranslationUnobfsucated.kt
+++ b/module/bukkit-nms/src/main/kotlin/taboolib/module/nms/remap/RemapTranslationUnobfsucated.kt
@@ -43,7 +43,7 @@ class RemapTranslationUnobfuscated : RemapTranslation() {
                 if (spigotFullName != null) {
                     val mapped = MinecraftVersion.paperMapping.classMapSpigotToMojang[spigotFullName]
                     if (mapped != null) {
-                        return resolveWithFallback(key, mapped)
+                        return resolveWithFallback(spigotFullName, mapped)
                     }
                 }
             }
@@ -57,12 +57,12 @@ class RemapTranslationUnobfuscated : RemapTranslation() {
      */
     fun resolveWithFallback(original: String, mojangName: String): String {
         val result = mojangName.replace('.', '/')
+        if (hasRuntimeClass(original.replace('/', '.'))) {
+            return original.replace(".","/")
+        }
         if (hasRuntimeClass(mojangName)) {
             return result
         }
-        if (hasRuntimeClass(original.replace('/', '.'))) {
-            return original
-        }
         return result
     }
 }