zones logic replacing bug fix