Fixed checkpoint handling