Checkpoints fix