Problem: previous modification introduced a possible memory leak and possible bouncing between peers during peer discovery#756