Fix city counting bug