@@ -281,11 +281,11 @@
 		if (sep != NULL) {
 			cmdend = sep;
 
 			/* Delete space at the end of the command. */
 			cmdend--; /* It currently derefs to the seperator.. */
-			while (*cmdend <= ' ') {
+			while (*cmdend <= ' ' && cmdend >= sep) {
 				*cmdend = '\0';
 				cmdend--;
 			}
 
 			/* Delete the seperator char and any leading space. */