fixes #6357 fix double escaping