Fix command parser