diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/StdErr.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/StdErr.c
index 9d110b7c16..e48cbe834d 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/StdErr.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/StdErr.c
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -176,7 +176,7 @@ Returns:
     return 0;
   }
 
-  for (Index = 0; Index < EFI_DRIVER_LIB_MAX_PRINT_BUFFER; Index++) {
+  for (Index = 0; Index <= MaxIndex; Index++) {
     UnicodeFormat[Index] = (CHAR16) Format[Index];
   }
 
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/StdErr.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/StdErr.c
index 9d110b7c16..e48cbe834d 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/StdErr.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/StdErr.c
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -176,7 +176,7 @@ Returns:
     return 0;
   }
 
-  for (Index = 0; Index < EFI_DRIVER_LIB_MAX_PRINT_BUFFER; Index++) {
+  for (Index = 0; Index <= MaxIndex; Index++) {
     UnicodeFormat[Index] = (CHAR16) Format[Index];
   }