Fix for geocoder