diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 5d2b90f6de9..b7c6db0e31f 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-24 Alain Magloire
+	* cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java
+	* cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlockManagement.java
+	* src/org/eclipse/cdt/debug/internal/core/model/CMemoryBlockExtension.java
+
 2005-03-23 Alain Magloire
 	Change is the ICDIMemoryBlock&& ICDIMemoryManagement API
 	* cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java
index 3109c680f4b..fb7873a0b5e 100644
--- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java
+++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlock.java
@@ -56,7 +56,8 @@ public interface ICDIMemoryBlock extends ICDIObject {
 	/**
 	 * Returns the values of the bytes currently contained
 	 * in this this memory block.
-	 * 
+	 * Note: the number maybe greater or lower to what
+	 * was requested.
 	 * @return the values of the bytes currently contained
 	 *  in this this memory block
 	 * @exception CDIException if this method fails.  Reasons include:
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlockManagement.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlockManagement.java
index 9f53cc70374..a61e5c2cef0 100644
--- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlockManagement.java
+++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlockManagement.java
@@ -24,7 +24,6 @@ public interface ICDIMemoryBlockManagement {
 
 	/**
 	 * Returns a memory block specified by given identifier.
-	 * total = units * wordSize;
 	 * @param address 
 	 * @param units - number of units
 	 * @param wordSize - The size of each memory word in bytes
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CMemoryBlockExtension.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CMemoryBlockExtension.java
index d89ca904e04..253f35b6c8f 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CMemoryBlockExtension.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CMemoryBlockExtension.java
@@ -401,7 +401,8 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemoryBlock
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getAddressibleSize()
 	 */
 	public int getAddressibleSize() {
-		return fWordSize;
+		ICDIMemoryBlock block = getCDIBlock();
+		return ( block != null ) ? block.getWordSize() : fWordSize;
 	}
 
 	/* (non-Javadoc)