fixed command parser