Fixed bug with spaces