@@ -137,11 +137,11 @@
 			continue;
 		}
 
 		/* Delete space at the end of the command. */
 		cmdend--; /* It currently derefs to the seperator.. */
-		while (*cmdend <= ' ') {
+		while (*cmdend <= ' ' && cmdend >= sep) {
 			*cmdend = '\0';
 			cmdend--;
 		}
 
 		cmd = linebuf_ptr;