Fixed the bug with spaces