diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/config/ConfigCache.java b/src/main/java/eu/endermite/commandwhitelist/spigot/config/ConfigCache.java
index 344bff9..6210f4c 100644
--- a/src/main/java/eu/endermite/commandwhitelist/spigot/config/ConfigCache.java
+++ b/src/main/java/eu/endermite/commandwhitelist/spigot/config/ConfigCache.java
@@ -52,6 +52,9 @@ public class ConfigCache {
     }
     public boolean addCommand(String command, String group) {
         try {
+            if (this.permList.get(group).contains(command)) {
+                return true;
+            }
             this.permList.get(group).add(command);
             this.config.set("commands."+group, permList.get(group));
             config.save(CommandWhitelist.getPlugin().getDataFolder()+"/config.yml");
diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java
index df6f3fd..38d038d 100644
--- a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java
+++ b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java
@@ -30,7 +30,7 @@ public class PlayerCommandPreProcessListener implements Listener {
                     String rawCmd = event.getMessage();
                     List<String> bannedSubCommands = CommandsList.getSuggestions(player);
                     for (String bannedSubCommand : bannedSubCommands) {
-                        if (rawCmd.equalsIgnoreCase("/"+bannedSubCommand) || rawCmd.equalsIgnoreCase("/"+bannedSubCommand+" ")) {
+                        if (rawCmd.startsWith("/"+bannedSubCommand)) {
                             event.setCancelled(true);
                             ConfigCache config = CommandWhitelist.getConfigCache();
                             player.sendMessage(ChatColor.translateAlternateColorCodes('&', config.getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getSubCommandDenied())));