Index: /applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java
===================================================================
--- /applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java	(revision 23081)
+++ /applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java	(revision 23082)
@@ -16,6 +16,4 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.visitor.AllNodesVisitor;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -47,6 +45,5 @@
 			return;
 
-		Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
-		Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
+		Collection<Node> affectedNodes = AlignWaysSegmentMgr.getInstance(Main.map.mapView).getSelectedNodes();
 
 		Command c = !Main.main.undoRedo.commands.isEmpty() ? Main.main.undoRedo.commands
Index: /applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java
===================================================================
--- /applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java	(revision 23081)
+++ /applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java	(revision 23082)
@@ -86,7 +86,4 @@
 					if (awSegs.algnUpdate(clickedPoint)) {
 						currentState.leftClick(this);
-						// Alignee changed, update selected nodes in the map
-						getCurrentDataSet().setSelected(
-								awSegs.getSelectedNodes());
 					}