diff --git a/src/main/java/co/aikar/commands/BaseCommand.java b/src/main/java/co/aikar/commands/BaseCommand.java
index 0a3accf1..a0f98d7f 100644
--- a/src/main/java/co/aikar/commands/BaseCommand.java
+++ b/src/main/java/co/aikar/commands/BaseCommand.java
@@ -321,7 +321,7 @@ public abstract class BaseCommand extends Command {
 
         for (Map.Entry<String, RegisteredCommand> entry : subCommands.entries()) {
             final String key = entry.getKey();
-            if (key.startsWith(argString) && !"__unknown".equals(key)) {
+            if (key.startsWith(argString) && !"__unknown".equals(key) && !"__default".equals(key)) {
                 final RegisteredCommand value = entry.getValue();
                 if (!value.hasPermission(sender)) {
                     continue;
diff --git a/src/main/java/co/aikar/commands/CommandCompletions.java b/src/main/java/co/aikar/commands/CommandCompletions.java
index bf7a5347..d83c7a16 100644
--- a/src/main/java/co/aikar/commands/CommandCompletions.java
+++ b/src/main/java/co/aikar/commands/CommandCompletions.java
@@ -26,7 +26,6 @@ package co.aikar.commands;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.EntityType;
 
 import java.util.HashMap;
 import java.util.List;