Fixed an issue with spaces