Fixed issue with character escaping.