fix managment of neighbour