Trying to fix location bug