diff --git a/src/freenet/io/comm/UdpSocketHandler.java b/src/freenet/io/comm/UdpSocketHandler.java
index bd0d9b1..b5a7f3d 100644
--- a/src/freenet/io/comm/UdpSocketHandler.java
+++ b/src/freenet/io/comm/UdpSocketHandler.java
@@ -197,7 +197,7 @@ public class UdpSocketHandler implements PrioRunnable, PacketSocketHandler, Port
 		try {
 			_sock.receive(packet);
 			InetAddress address = packet.getAddress();
-			boolean isLocal = !IPUtil.isValidAddress(address, false);
+			boolean isLocal = false; /* !IPUtil.isValidAddress(address, false); */
 			collector.addInfo(address, packet.getPort(),
 					getHeadersLength(address) + packet.getLength(), 0, isLocal);
 		} catch (SocketTimeoutException e1) {
@@ -252,7 +252,7 @@ public class UdpSocketHandler implements PrioRunnable, PacketSocketHandler, Port
 		try {
 			_sock.send(packet);
 			tracker.sentPacketTo(destination);
-			boolean isLocal = (!IPUtil.isValidAddress(address, false)) && (IPUtil.isValidAddress(address, true));
+			boolean isLocal = false /*(!IPUtil.isValidAddress(address, false)) && (IPUtil.isValidAddress(address, true))*/;
 			collector.addInfo(address, port, 0, getHeadersLength(address) + blockToSend.length, isLocal);
 			if(logMINOR) Logger.minor(this, "Sent packet length "+blockToSend.length+" to "+address+':'+port);
 		} catch (IOException e) {
diff --git a/src/freenet/node/NodeIPDetector.java b/src/freenet/node/NodeIPDetector.java
index 60a2bb9..7796493 100644
--- a/src/freenet/node/NodeIPDetector.java
+++ b/src/freenet/node/NodeIPDetector.java
@@ -149,7 +149,7 @@ public class NodeIPDetector {
 			// If the IP is overridden and the override is valid, the override has to be the first element.
 			// overrideIPAddress will be null if the override is invalid
 			addresses.add(overrideIPAddress);
-			if(overrideIPAddress.isRealInternetAddress(false, true, false))
+			if(overrideIPAddress.isRealInternetAddress(false, true, true))
 				addedValidIP = true;
 		}