Attempt to fix location bug