diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index dcbaf084fe4..e7959df7051 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-01 Mikhail Khodjaiants
+	New fix for bug 80034: Expressions view does not display correct no. of elements in array.
+	* CValueFactory.java
+	* CExpression.java
+
 2004-12-03 Mikhail Khodjaiants
 	Fix for bug 62659: Unable to set default for register format via plugin_customization.ini.
 	* CDebugCorePreferenceInitializer.java: new
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CExpression.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CExpression.java
index 708b1c1917f..8677dd02840 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CExpression.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CExpression.java
@@ -129,7 +129,7 @@ public class CExpression extends CVariable implements IExpression {
 							if ( type != null && type.isArray() ) {
 								int[] dims = type.getArrayDimensions();
 								if ( dims.length > 0 && dims[0] > 0 )
-									fValue = CValueFactory.createIndexedValue( this, (ICDIArrayValue)value, 0, dims[0] - 1 );
+									fValue = CValueFactory.createIndexedValue( this, (ICDIArrayValue)value, 0, dims[0] );
 							}
 						}
 						else {
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java
index 600fa6d3b30..667434b0a9b 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValueFactory.java
@@ -27,8 +27,8 @@ public class CValueFactory {
 		return new CValue( parent, cdiValue );
 	}
 
-	static public CIndexedValue createIndexedValue( AbstractCVariable parent, ICDIArrayValue cdiValue, int start, int end ) {
-		return new CIndexedValue( parent, cdiValue, start, end - start + 1 );
+	static public CIndexedValue createIndexedValue( AbstractCVariable parent, ICDIArrayValue cdiValue, int start, int length ) {
+		return new CIndexedValue( parent, cdiValue, start, length );
 	}
 
 	static public CValue createGlobalValue( CVariable parent, ICDIValue cdiValue ) {