Imporvement on stop condition.