fixed cityNullProblem