Order of precedence fix