Avoid double escaping of white space