Added some condition to converge sooner