correct body and ref fields