diff --git a/src/main/java/fucoin/wallet/AbstractWallet.java b/src/main/java/fucoin/wallet/AbstractWallet.java
index 0e92f83dbeb7b085cf162111382bdf3ff6c2c359..b745bdd8b5b9596d173cbb751bc79a5ff15aae6b 100644
--- a/src/main/java/fucoin/wallet/AbstractWallet.java
+++ b/src/main/java/fucoin/wallet/AbstractWallet.java
@@ -182,15 +182,19 @@ public abstract class AbstractWallet extends AbstractNode implements Serializabl
         overlayNeighbours.add(wallet);
     }
 
-    //TODO: ????!???
-	/*@Override
+	@Override
 	public ActorRef getRandomNeighbor() {
-		List<ActorRef> neighbors = new ArrayList<>(overlayNeighbours);
+		List<ActorRef> neighbors;
+		if (overlayNeighbours != null && !overlayNeighbours.isEmpty()) {
+			neighbors = new ArrayList<>(overlayNeighbours);
+		} else {
+			neighbors = new ArrayList<>(getKnownNeighbors().values());
+		}
 		if (getExcludedNeighbors().size() < neighbors.size()) {
 			neighbors.removeAll(getExcludedNeighbors());
 		}
 		Random rand = new Random();
 		int index = rand.nextInt(neighbors.size());
 		return neighbors.get(index);
-	}*/
+	}
 }