Fix neighbor discovery