Trying to fix location detection