fix location setting stuff