diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index d148cf36d73..e46091863cc 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-21 Mikhail Khodjaiants
+	Fix for bug 36682.
+	* CDTDebugModelPresentation.java
+
 2003-04-21 Mikhail Khodjaiants
 	Temporary fix for character values.
 	* CDTDebugModelPresentation.java
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
index ed17bcf0a57..ed54382b16a 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
@@ -485,7 +485,9 @@ public class CDTDebugModelPresentation extends LabelProvider
 		{
 			if ( isShowVariableTypeNames() )
 			{
-				label += var.getReferenceTypeName() + " ";
+				String type = getVariableTypeName( var );
+				if ( type != null && type.length() > 0 )
+					label += type + " ";
 			}
 			label += var.getName();
 			IValue value = var.getValue();
@@ -931,4 +933,23 @@ public class CDTDebugModelPresentation extends LabelProvider
 		}
 		return result;
 	}
+
+	private String getVariableTypeName( IVariable variable )
+	{
+		String type = null;
+		try
+		{
+			type = variable.getReferenceTypeName();
+			if ( type != null )
+			{
+				int index = type.indexOf( '[' );
+				if ( index != -1 )
+					return type.substring( 0, index ).trim();
+			}
+		}
+		catch( DebugException e )
+		{
+		}
+		return type;
+	}
 }