Fix computation of currentTol