Fix body handling