diff --git a/src/main/java/com/nemez/cmdmgr/CommandManager.java b/src/main/java/com/nemez/cmdmgr/CommandManager.java
index b13745c..5beb1e6 100644
--- a/src/main/java/com/nemez/cmdmgr/CommandManager.java
+++ b/src/main/java/com/nemez/cmdmgr/CommandManager.java
@@ -293,7 +293,7 @@ public class CommandManager {
 			final Field mapField = Bukkit.getServer().getClass().getDeclaredField("commandMap");
 			mapField.setAccessible(true);
 			CommandMap map = (CommandMap) mapField.get(Bukkit.getServer());
-			final Field knownCommandsField = mapField.getClass().getDeclaredField("knownCommands");
+			final Field knownCommandsField = mapField.getClass().getSuperclass().getDeclaredField("knownCommands");
 			knownCommandsField.setAccessible(true);
 			@SuppressWarnings("unchecked")
 			Map<String, Command> knownCommands = (Map<String, Command>) knownCommandsField.get(map);
@@ -313,7 +313,7 @@ public class CommandManager {
 				final Field cmdMap = Bukkit.getServer().getClass().getDeclaredField("commandMap");
 				cmdMap.setAccessible(true);
 				CommandMap map = (CommandMap) cmdMap.get(Bukkit.getServer());
-				final Field knownCommandsField = map.getClass().getDeclaredField("knownCommands");
+				final Field knownCommandsField = map.getClass().getSuperclass().getDeclaredField("knownCommands");
 				knownCommandsField.setAccessible(true);
 				@SuppressWarnings("unchecked")
 				Map<String, Command> knownCommands = (Map<String, Command>) knownCommandsField.get(map);
diff --git a/src/main/java/com/nemez/cmdmgr/util/Executable.java b/src/main/java/com/nemez/cmdmgr/util/Executable.java
index e1f9aed..2bfc3da 100644
--- a/src/main/java/com/nemez/cmdmgr/util/Executable.java
+++ b/src/main/java/com/nemez/cmdmgr/util/Executable.java
@@ -89,7 +89,7 @@ public class Executable extends org.bukkit.command.Command {
 			final Field cmdMap = Bukkit.getServer().getClass().getDeclaredField("commandMap");
 			cmdMap.setAccessible(true);
 			CommandMap map = (CommandMap) cmdMap.get(Bukkit.getServer());
-			final Field knownCommandsField = map.getClass().getDeclaredField("knownCommands");
+			final Field knownCommandsField = map.getClass().getSuperclass().getDeclaredField("knownCommands");
 			knownCommandsField.setAccessible(true);
 			@SuppressWarnings("unchecked")
 			Map<String, Command> knownCommands = (Map<String, Command>) knownCommandsField.get(map);