Index: trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java	(revision 748)
+++ trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java	(revision 749)
@@ -23,5 +23,5 @@
 /**
  * Aligns all selected nodes within a circle. (Useful for roundabouts)
- * 
+ *
  * @author Matthew Newton
  */
@@ -35,9 +35,9 @@
 		Collection<OsmPrimitive> sel = Main.ds.getSelected();
 		Collection<Node> nodes = new LinkedList<Node>();
-		
+
 		for (OsmPrimitive osm : sel)
 			if (osm instanceof Node)
 				nodes.add((Node)osm);
-		
+
 		// special case if no single nodes are selected and exactly one way is: 
 		// then use the way's nodes
@@ -45,6 +45,10 @@
 			for (OsmPrimitive osm : sel)
 				if (osm instanceof Way)
-					nodes.addAll(((Way)osm).nodes);
-		
+					for (Node n : ((Way)osm).nodes)
+					{
+						if(!nodes.contains(n))
+							nodes.add(n);
+					}
+
 		if (nodes.size() < 4) {
 			JOptionPane.showMessageDialog(Main.parent, tr("Please select at least four nodes."));