bugfix for locality