Index: applications/editors/josm/plugins/FixAddresses/build.xml
===================================================================
--- applications/editors/josm/plugins/FixAddresses/build.xml	(revision 35976)
+++ applications/editors/josm/plugins/FixAddresses/build.xml	(revision 35978)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="[josm_fixadresses]: Fixes #josm8336"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="18494"/>
 	
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessedValueHandler.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessedValueHandler.java	(revision 35976)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessedValueHandler.java	(revision 35978)
@@ -162,5 +162,5 @@
 
         if (n.hasKey(tag)) {
-            double dist = n.getCoor().greatCircleDistance(aNode.getCoor());
+            double dist = n.greatCircleDistance(aNode.getCoor());
             if (dist < minDist && dist < maxDist) {
                 minDist = dist;
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OsmUtils.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OsmUtils.java	(revision 35976)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OsmUtils.java	(revision 35978)
@@ -6,4 +6,5 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
@@ -45,6 +46,6 @@
 
         for (Pair<Node, Node> pair : x) {
-            LatLon ap = pair.a.getCoor();
-            LatLon bp = pair.b.getCoor();
+            ILatLon ap = pair.a;
+            ILatLon bp = pair.b;
 
             double dist = findMinimum(ap, bp, coor);
@@ -64,5 +65,5 @@
      * @return the double the minimum distance in m of the way and the node
      */
-    private static double findMinimum(LatLon a, LatLon b, LatLon c) {
+    private static double findMinimum(ILatLon a, ILatLon b, ILatLon c) {
         CheckParameterUtil.ensureParameterNotNull(c, "c");
         CheckParameterUtil.ensureParameterNotNull(b, "b");