Workaround for switching client_locations