Termination criteria behvaior is now consistent