Fixed issues with spaces