fix for sessions and checkpoints