Fix for checkpoint not being removed