escaping fixes