fix checkpointing evaluation
pull from 6.0