final checkpoint fix