Escape character mapping fix