Fix from upstream (Fix city name style)