CheckPoint Fix