Fix bss zone management