Temporary fix until geoip happens