diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 35be1602245..479d836d8aa 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-21 Mikhail Khodjaiants
+	Changes to the IBinary interface
+	* CDebugTarget.java
+
 2004-09-20 Mikhail Khodjaiants
 	Evaluate expressions on stack frame instead of target to provide evaluation context.
 	* ICDebugTarget.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
index 756c36b0adf..c80aed2c275 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
@@ -20,6 +20,7 @@ import java.util.StringTokenizer;
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.IAddress;
 import org.eclipse.cdt.core.IAddressFactory;
+import org.eclipse.cdt.core.IBinaryParser;
 import org.eclipse.cdt.core.model.CModelException;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.IBinary;
@@ -1827,7 +1828,9 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv
 			if ( getExecFile() != null && CoreModel.getDefault().isBinary( getExecFile() ) ) {
 				ICElement cFile = CCorePlugin.getDefault().getCoreModel().create( getExecFile() );
 				if ( cFile instanceof IBinary ) {
-					fAddressFactory = ((IBinary)cFile).getAddressFactory();
+					IBinaryParser.IBinaryObject obj;
+					obj = (IBinaryParser.IBinaryObject)cFile.getAdapter(IBinaryParser.IBinaryObject.class);
+					fAddressFactory = obj.getAddressFactory();
 				}
 			}
 		}