fix location variables