Fix zone matcher