Fixed character escaping issue