Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java
===================================================================
--- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java	(revision 14122)
+++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java	(revision 16294)
@@ -151,5 +151,5 @@
         bounds = null;
     } else {
-        final Point point = mapView.getPoint(this.getWayPoint().eastNorth);
+        final Point point = mapView.getPoint(this.getWayPoint().getCoor());
         bounds = new Rectangle(point.x - ImageEntry.ICON_WIDTH,
         point.y - ImageEntry.ICON_HEIGHT,
Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java
===================================================================
--- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java	(revision 14122)
+++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java	(revision 16294)
@@ -150,8 +150,6 @@
                 final ImageEntry imageEntry = images[index];
 
-                if (null != imageEntry.getWayPoint()
-                && null != imageEntry.getWayPoint().eastNorth) {
-                    visitor.visit(imageEntry.getWayPoint().eastNorth);
-                }
+                if (imageEntry.getWayPoint() != null)
+                    visitor.visit(imageEntry.getWayPoint().getCoor());
             }
         }