Minor correction to whitespace handling to ensure non space whitespace is always converted to a space