fix order of conditions for zone