Neighbour fix