use_city fix