Fixed bug on CommandParser