Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java	(revision 24146)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java	(revision 24147)
@@ -44,5 +44,5 @@
 	@Override
 	public void updateEnabledState(AddressEditSelectionEvent ev) {
-		setEnabled(ev != null && ev.getUnresolvedAddressTable() != null);
+		setEnabled(ev != null && ev.hasAddresses());
 	}
 
@@ -52,5 +52,5 @@
 	@Override
 	protected void updateEnabledState(AddressEditContainer container) {
-		setEnabled(container != null && container.getNumberOfIncompleteAddresses() > 0);
+		setEnabled(container != null && container.getNumberOfInvalidAddresses() > 0);
 	}
 
@@ -60,7 +60,6 @@
 	@Override
 	public void addressEditActionPerformed(AddressEditContainer container) {
-		if (container == null) return;
-		if (container.getNumberOfUnresolvedAddresses() == 0) return;
-				
+		if (container == null || container.getNumberOfInvalidAddresses() == 0) return;
+						
 		internalGuessAddresses(container.getAllAddressesToFix());
 	}