Marshaller is now escaping also \r char