--- src/ui.c.orig	2012-11-01 19:43:54.758296074 +0100
+++ src/ui.c	2012-11-01 20:03:03.474633125 +0100
@@ -146,7 +146,8 @@
 		if (name[i][0] == '-' && STREQ(arg, name[i]))
 			return true;
 		/* New command name options */
-		if (strncmp(arg + skip, name[i], len - skip) == 0)
+		if (len - skip == strlen(name[i]) &&
+		    STRNEQ(arg + skip, name[i], len - skip))
 			return true;
 	}
 	return false;