command parser fixed