Attempt to fix parsing spaces