Fixing bug where arguments with spaces isn't passed through