fixed escaping issues