Fix checkpoint issue;