diff --git a/src/freenet/node/LocationManager.java b/src/freenet/node/LocationManager.java
index 74b8814..67ec354 100644
--- a/src/freenet/node/LocationManager.java
+++ b/src/freenet/node/LocationManager.java
@@ -746,37 +746,45 @@ public class LocationManager implements ByteCounter {
         if(logMINOR) Logger.minor(this, sb.toString());
         
         double A = 1.0;
+		int Ac = 0;
         for(int i=0;i<friendLocs.length;i++) {
             if(Math.abs(friendLocs[i] - myLoc) <= Double.MIN_VALUE*2) continue;
             A *= Location.distance(friendLocs[i], myLoc);
+			Ac++;
         }
         for(int i=0;i<hisFriendLocs.length;i++) {
             if(Math.abs(hisFriendLocs[i] - hisLoc) <= Double.MIN_VALUE*2) continue;
             A *= Location.distance(hisFriendLocs[i], hisLoc);
+			Ac++;
         }
+		A = Math.pow(A, 1.0/Ac);
         
         // B = the same, with our two values swapped
         double B = 1.0;
+		int Bc = 0;
         for(int i=0;i<friendLocs.length;i++) {
             if(Math.abs(friendLocs[i] - hisLoc) <= Double.MIN_VALUE*2) continue;
             B *= Location.distance(friendLocs[i], hisLoc);
+			Bc++;
         }
         for(int i=0;i<hisFriendLocs.length;i++) {
             if(Math.abs(hisFriendLocs[i] - myLoc) <= Double.MIN_VALUE*2) continue;
             B *= Location.distance(hisFriendLocs[i], myLoc);
+			Bc++;
         }
+		B = Math.pow(B, 1.0/Bc);
         
-        //Logger.normal(this, "A="+A+" B="+B);
+        Logger.normal(this, "`~~> A="+A+" B="+B + "  swap = " + (A>B));
         
         if(A>B) return true;
         
-        double p = A / B;
+        double p = Math.pow(0.01, 1.0-A / B);
         
         // Take last 63 bits, then turn into a double
         double randProb = ((double)(rand & Long.MAX_VALUE)) 
                 / ((double) Long.MAX_VALUE);
         
-        //Logger.normal(this, "p="+p+" randProb="+randProb);
+        Logger.normal(this, "`~~> p="+p+" randProb="+randProb + "  swap = " +(randProb < p) );
         
         if(randProb < p) return true;
         return false;