Fix body decoding