Went with solution from geocoder issue to fix #122.