Fix body data encoding