Bug fix Checkpoint handler.