fix stupid bug in condition order