minor clean up
Recorder doesn't properly extract bodies, close #1157