diff --git a/src/cmd/flag.d b/src/cmd/flag.d
index 52c8de8..91a9207 100644
--- a/src/cmd/flag.d
+++ b/src/cmd/flag.d
@@ -104,7 +104,7 @@ public class Flag {
             return false;
         return
             (query.startsWith("--") && longName == query[2..$])
-            || (query.startsWith("-") && shortName == query[1..2])
+            || (query.length == 2 && query.startsWith("-") && shortName == query[1..2])
             || query == longName
             || query == shortName;
     }