fix message locality