[3.8] Fix character escaping