Fixed the bug with checkpoints scattered