Improved convergence check significantly