Issue #28: checkpoint ...