Fix command parsing