case fix and geolocation fix