Fix zoneadd logic