diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c
index dd07dfc..a3ddce9 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c
@@ -51,7 +51,7 @@
 {
   UINTN       Index;
 
-  for (Index = 0; Index < sizeof (QuestionOpcodeMap) / sizeof (QuestionOpcodeMap[0]); Index++) {
+  for (Index = 0; Index < ARRAY_SIZE (QuestionOpcodeMap); Index++) {
     if (FwOp == QuestionOpcodeMap[Index].FrameworkIfrOp) {
       *UefiOp = QuestionOpcodeMap[Index].UefiIfrOp;
       return EFI_SUCCESS;