Fixed issue with double escaping.