Fixed the command parser