Fixed the parsing of the command call expressions