diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index 0e71f642ffa..3e3692d1ced 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-21 Mikhail Khodjaiants
+	Fixed the problems with the Disassembly view and address breakpoints caused by switch to IAddress.
+	* CBreakpointPropertyPage.java
+	* DisassemblyEditorInput.java
+
 2004-09-20 Mikhail Khodjaiants
 	Fix for bug 73920: Stopping CDT debug at a break point and using a non-text editor throws an error.
 	* ResumeAtLineActionDelegate.java
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java
index 8e8408b0957..b6ccc8d5f8e 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/propertypages/CBreakpointPropertyPage.java
@@ -13,7 +13,6 @@ package org.eclipse.cdt.debug.internal.ui.propertypages;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-
 import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint;
 import org.eclipse.cdt.debug.core.model.ICBreakpoint;
 import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint;
@@ -293,6 +292,11 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement
 			ICAddressBreakpoint abrkpt = (ICAddressBreakpoint)breakpoint;
 			addField( createLabelEditor( getFieldEditorParent(), PropertyPageMessages.getString( "CBreakpointPropertyPage.18" ), PropertyPageMessages.getString( "CBreakpointPropertyPage.6" ) ) );  //$NON-NLS-1$//$NON-NLS-2$
 			String address = PropertyPageMessages.getString( "CBreakpointPropertyPage.4" ); //$NON-NLS-1$
+			try {
+				address = abrkpt.getAddress();
+			}
+			catch( CoreException e ) {
+			}
 			if ( address != null ) {
 				addField( createLabelEditor( getFieldEditorParent(), PropertyPageMessages.getString( "CBreakpointPropertyPage.5" ), address ) ); //$NON-NLS-1$
 			}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyEditorInput.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyEditorInput.java
index f906a94e5ea..a49aec8aaf7 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyEditorInput.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/disassembly/DisassemblyEditorInput.java
@@ -135,7 +135,7 @@ public class DisassemblyEditorInput implements IEditorInput {
 				++result;
 				for ( int j = 0; j < instructions.length; ++j ) {
 					++result;
-					if ( address.compareTo(instructions[j].getAdress()) ==  0) {
+					if ( address.equals( instructions[j].getAdress() ) ) {
 						return result;
 					}
 				}