HH-36521 do not rely on the postprocessor to call finish()