Fix location loading