Fix command parsing bug