fix location loading