Fix zone associaton