diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 5e6bb21d183..6ccd6062fa5 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-06 Mikhail Khodjaiants
+	Bug 98594: Unable to set address breakpoints.
+	* CBreakpointManager.java
+
 2005-05-24 Mikhail Khodjaiants
 	Bug 88558: run-to-line not thread oriented.
 	The IRunTo* and IJumpTo* interfaces moved to ICStackFrame.
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
index 6a3cff6daa6..5feb93e255b 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
@@ -519,16 +519,16 @@ public class CBreakpointManager implements IBreakpointManagerListener, ICDIEvent
 					synchronized ( getBreakpointMap() ) {
 						ICDIBreakpoint cdiBreakpoint = getBreakpointMap().getCDIBreakpoint( breakpoint );
 						if ( cdiBreakpoint == null ) {
-							if ( location instanceof ICDILineLocation ) {
-								cdiBreakpoint = target.setLineBreakpoint( ICDIBreakpoint.REGULAR,
-										(ICDILineLocation)location, condition, true );
-							} else if ( location instanceof ICDIFunctionLocation ) {
+							if ( breakpoint instanceof ICFunctionBreakpoint ) {
 								cdiBreakpoint = target.setFunctionBreakpoint( ICDIBreakpoint.REGULAR,
 										(ICDIFunctionLocation)location, condition, true );								
-							} else if ( location instanceof ICDIAddressLocation ) {
+							} else if ( breakpoint instanceof ICAddressBreakpoint ) {
 								cdiBreakpoint = target.setAddressBreakpoint( ICDIBreakpoint.REGULAR,
 										(ICDIAddressLocation)location, condition, true );
 								
+							} else if ( breakpoint instanceof ICLineBreakpoint ) {
+								cdiBreakpoint = target.setLineBreakpoint( ICDIBreakpoint.REGULAR,
+										(ICDILineLocation)location, condition, true );
 							}
 							if ( !enabled ) {
 								cdiBreakpoint.setEnabled( false );