diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
index a428e81bd43..028fe45e151 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-21 Alain Magloire
+	Fix for PR 103193
+	* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocationBreakpoint.java
+	* src/org/eclipse/cdt/debug/mi/core/MIPlugin.java
+
 2005-07-18 Alain Magloire
 	GDB has now four different version of MI, so it has become
 	important to give the user the choice of the version.
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocationBreakpoint.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocationBreakpoint.java
index 91c68d0008d..9f8113f8c4e 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocationBreakpoint.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/LocationBreakpoint.java
@@ -67,11 +67,16 @@ public abstract class LocationBreakpoint extends Breakpoint implements ICDIBreak
 	}
 
 	public String getFunction() {
-		if (miBreakpoints != null && miBreakpoints.length > 0) {
-			return miBreakpoints[0].getFunction();
-		} else if (fLocation instanceof ICDIFunctionLocation) {
+		// TODO: We need to review this but for now
+		// we need to return what the cdt debug passed us
+		// it is necessary when they do the comparison.
+		if (fLocation instanceof ICDIFunctionLocation) {
 			return ((ICDIFunctionLocation)fLocation).getFunction();
-		}
+		} else if (miBreakpoints != null && miBreakpoints.length > 0) {
+			return miBreakpoints[0].getFunction();
+		} /*else if (fLocation instanceof ICDIFunctionLocation) {
+			return ((ICDIFunctionLocation)fLocation).getFunction();
+		}*/
 		return null;
 	}
 
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java
index 6edd1214544..db799b262b5 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/MIPlugin.java
@@ -23,7 +23,6 @@ import org.eclipse.cdt.debug.mi.core.command.CLITargetAttach;
 import org.eclipse.cdt.debug.mi.core.command.CommandFactory;
 import org.eclipse.cdt.debug.mi.core.command.MIStackListFrames;
 import org.eclipse.cdt.debug.mi.core.command.MITargetSelect;
-import org.eclipse.cdt.debug.mi.core.command.MIVersion;
 import org.eclipse.cdt.debug.mi.core.output.MIInfo;
 import org.eclipse.cdt.utils.pty.PTY;
 import org.eclipse.core.runtime.IProgressMonitor;