Checkpint fix