Commit before fixing checkpoint

Adding checks