Bugfix checkpointing