issue #157 checkpoint