diff --git a/lib/cli/clicommand.cpp b/lib/cli/clicommand.cpp
index 76ac23230..3b42ffc89 100644
--- a/lib/cli/clicommand.cpp
+++ b/lib/cli/clicommand.cpp
@@ -171,7 +171,7 @@ bool CLICommand::ParseCommand(int argc, char **argv, po::options_description& vi
 	typedef std::map<std::vector<String>, CLICommand::Ptr>::value_type CLIKeyValue;
 
 	std::vector<String> best_match;
-	int arg_end = 1;
+	int arg_end = 0;
 
 	BOOST_FOREACH(const CLIKeyValue& kv, GetRegistry()) {
 		const std::vector<String>& vname = kv.first;