changed treating of spaces