Allow for spaces in option