Fixed parsing of commands.