diff --git a/src/com/sk89q/worldedit/WorldEdit.java b/src/com/sk89q/worldedit/WorldEdit.java
index a896aae81..106800f58 100644
--- a/src/com/sk89q/worldedit/WorldEdit.java
+++ b/src/com/sk89q/worldedit/WorldEdit.java
@@ -858,7 +858,8 @@ public class WorldEdit {
             if (commands.hasCommand(searchCmd)) {
             } else if (config.noDoubleSlash && commands.hasCommand("/" + searchCmd)) {
                 split[0] = "/" + split[0];
-            } else if (commands.hasCommand(searchCmd.substring(1))) {
+            } else if (split[0].length() >= 2 && split[0].charAt(0) == '/'
+                    && commands.hasCommand(searchCmd.substring(1))) {
                 split[0] = split[0].substring(1);
             }