Changed ordering of conditions