Trying to fix location again