Fix issue with single spaces