Fix CheckPoint