Another fix for finalize.