bug fix to checkpoint-on-restore; still fails on 612