diff --git a/src/io/pipeer.cpp b/src/io/pipeer.cpp
index 837124b1..a26c2024 100755
--- a/src/io/pipeer.cpp
+++ b/src/io/pipeer.cpp
@@ -40,8 +40,10 @@ PIPeer::PeerInfo::Address::Address(const PIString & a, const PIString & m): addr
 int PIPeer::PeerInfo::ping() const {
 	int ret = -1;
 	piForeachC (Address & a, addresses)
-		if (a.ping > 0.)
-			ret = piMini(ret, piRoundd(a.ping));
+		if (a.ping > 0.) {
+			if (ret < 0) ret = piRoundd(a.ping);
+			else ret = piMini(ret, piRoundd(a.ping));
+		}
 	return ret;
 }
 
@@ -51,7 +53,8 @@ PIString PIPeer::PeerInfo::fastestAddress() const {
 	PIString ret;
 	piForeachC (Address & a, addresses)
 		if (a.ping > 0.) {
-			mp = piMind(mp, a.ping);
+			if (mp < 0) mp = a.ping;
+			else mp = piMind(mp, a.ping);
 			ret = a.address;
 		}
 	return ret;