Fixing weird spaces