CRLF/CR escaping fix