Changed order in parse-command.