Fixed neighbour_found issue