Improve escaping