Possible fix for location detection issues