Fixed finding best neighbour