Fix issue with spaces passed