Trying to fix location bug 2