diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java
index 8cb72214..e666debe 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java
@@ -153,13 +153,12 @@ public final class Reflection {
 				return Class.forName(ORG_BUKKIT_CRAFTBUKKIT + name.substring(22));
 			} else if(MAJOR_VERSION < 17 && name.startsWith("net.minecraft")) {
 				return Class.forName(LEGACY_NET_MINECRAFT_SERVER + "." + name.split("[.](?=[^.]*$)")[1]);
+			} else if(MAJOR_VERSION < 21 || MINOR_VERSION < 4) {
+				return Class.forName(spigotClassnames.getOrDefault(name, name));
 			} else {
 				return Class.forName(name);
 			}
 		} catch (ClassNotFoundException e) {
-			if(spigotClassnames.containsKey(name))
-				return getClass(spigotClassnames.get(name));
-
 			throw new IllegalArgumentException("Cannot find " + name, e);
 		}
 	}