Checkpoint fix