fix command parser