fix escaping.
NOT RELEASED YET