Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 23964)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 23965)
@@ -359,6 +359,6 @@
 		String streetName = aNode.getStreet();
 		
-		if (streetName != null && streetDict.containsKey(streetName)) {
-			StreetNode sNode = streetDict.get(streetName);
+		if (streetName != null && shadowStreetDict.containsKey(streetName)) {
+			StreetNode sNode = shadowStreetDict.get(streetName);
 			sNode.addAddress(aNode);
 			return true;
@@ -373,5 +373,5 @@
 	public void resolveAddresses() {
 		List<AddressNode> resolvedAddresses = new ArrayList<AddressNode>();
-		for (AddressNode node : unresolvedAddresses) {
+		for (AddressNode node : shadowUnresolvedAddresses) {
 			if (assignAddressToStreet(node)) {
 				resolvedAddresses.add(node);
@@ -381,5 +381,5 @@
 		/* Remove all resolves nodes from unresolved list */
 		for (AddressNode resolved : resolvedAddresses) {
-			unresolvedAddresses.remove(resolved);
+			shadowUnresolvedAddresses.remove(resolved);
 		}
 	}
@@ -405,5 +405,5 @@
 			// sort lists
 			Collections.sort(shadowIncompleteAddresses);
-			Collections.sort(shadowIncompleteAddresses);
+			Collections.sort(shadowUnresolvedAddresses);
 
 			// put results from shadow copy into real lists