expand support for escaping