Fixing a condition where matched commands with more than one argument were broken in certain conditions