cosmetic: change a condition ordering