fixed escaping issue