Fixed bug in command parser