Index: /applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java
===================================================================
--- /applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java	(revision 23419)
+++ /applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java	(revision 23420)
@@ -1040,4 +1040,7 @@
     private void RemoveAddressInterpolationWay() {
 
+        // Remove way - nodes of the way remain
+        commandGroup.add(new DeleteCommand(addrInterpolationWay));
+
         // Remove untagged nodes
         for (int i=1; i<addrInterpolationWay.getNodesCount()-1; i++) {
@@ -1048,6 +1051,4 @@
         }
 
-        // Remove way
-        commandGroup.add(new DeleteCommand(addrInterpolationWay));
         addrInterpolationWay = null;