Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java	(revision 24145)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java	(revision 24146)
@@ -402,7 +402,9 @@
 	 * @return true, if this instance needs at least one guessed value.
 	 */
-	public boolean needsGuess() {
+	public boolean needsGuess() {		
 		return 	needsGuessedValue(TagUtils.ADDR_CITY_TAG) ||
 				needsGuessedValue(TagUtils.ADDR_POSTCODE_TAG) ||
+				needsGuessedValue(TagUtils.ADDR_COUNTRY_TAG) ||
+				needsGuessedValue(TagUtils.ADDR_STATE_TAG) ||
 				needsGuessedValue(TagUtils.ADDR_STREET_TAG);
 	}