fixing some escaping issues