Fix zone order logic