Improved escaping