Tries to fix location update issue.. still need to test