bugfix calculateCity/Zone