Fixed exit conditions