Fix for checkpoints