Fix body parsing