Fix bug in location picker