Fix for command-line args containing spaces