Fix cib checkpoints ordering