diff --git a/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java b/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
index ea7da704..71e4ad5c 100644
--- a/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
+++ b/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
@@ -143,6 +143,17 @@ public class BukkitCommandManager extends CommandManager {
         }
     }
 
+    public void unregisterCommand(BaseCommand command) {
+        command.onRegister(this);
+        for (RootCommand rootcommand : command.registeredCommands.values()) {
+            BukkitRootCommand bukkitCommand = (BukkitRootCommand) rootcommand;
+            if (bukkitCommand.isRegistered) {
+                unregisterCommand(bukkitCommand);
+            }
+            bukkitCommand.isRegistered = false;
+        }
+    }
+
     public void unregisterCommand(BukkitRootCommand command) {
         final String plugin = this.plugin.getName().toLowerCase();
         command.unregister(commandMap);