GIRAPH-924: Fix checkpointing (edunov via majakabiljo)