Added additional escaping