Checkpointing still fails (#15), relax rules more.