diff --git a/libretroshare/src/pqi/pqiipset.h b/libretroshare/src/pqi/pqiipset.h
index 29c8aaddd..6da862b08 100644
--- a/libretroshare/src/pqi/pqiipset.h
+++ b/libretroshare/src/pqi/pqiipset.h
@@ -29,7 +29,7 @@
 #include "util/rsnet.h"
 #include "serialiser/rstlvaddrs.h"
 
-#define MAX_ADDRESS_LIST_SIZE 4
+#define MAX_ADDRESS_LIST_SIZE 10
 
 class pqiIpAddress
 {
diff --git a/libretroshare/src/services/p3discovery2.cc b/libretroshare/src/services/p3discovery2.cc
index 64e2ac1df..286848a6f 100644
--- a/libretroshare/src/services/p3discovery2.cc
+++ b/libretroshare/src/services/p3discovery2.cc
@@ -356,7 +356,8 @@ void p3discovery2::sendOwnContactInfo(const SSLID &sslid)
 		std::vector<sockaddr_storage> addrs;
 		if(!detail.hiddenNode && getLocalAddresses(addrs))
 		{
-			/* To work around 4 addresses limitation, let's shuffle the list of
+			/* To work around MAX_ADDRESS_LIST_SIZE addresses limitation,
+			 *  let's shuffle the list of
 			 *  local addresses in the hope that with enough time every local
 			 *  address is advertised to trusted nodes so they may try to
 			 *  connect to all of them including the most convenient if a local