Fix Zone switch bug