Actually fixed checkpoints