fix bug city = null