issue #126 checkpoint