fixed parsing issues with spaces