Checkpoint fix before argument evaluating