Fix multiple zone problems.