buggy node discovery

[adityathiru]

• Node discovery appears to be buggy sometimes.
• Look into the current implementation and see if it can be improved.
• Task assigned to @adityathiru