diff --git a/src/commandline.cpp b/src/commandline.cpp
index 9dd25ac..d9f6fb4 100644
--- a/src/commandline.cpp
+++ b/src/commandline.cpp
@@ -39,7 +39,7 @@ namespace bx
 			switch (state)
 			{
 				case SkipWhitespace:
-					for (; isSpace(*curr); ++curr) {}; // skip whitespace
+					for (; isSpace(*curr) && *curr!=_term; ++curr) {}; // skip whitespace
 					state = SetTerm;
 					break;