Fix checkpoints?;