Fixed issue with spaces