Fix the argument parsing so that arguments with spaces can be parsed correctly