diff --git a/source/compiler/aslcodegen.c b/source/compiler/aslcodegen.c
index 72b7215..d9ab8bf 100644
--- a/source/compiler/aslcodegen.c
+++ b/source/compiler/aslcodegen.c
@@ -494,8 +494,7 @@ CgWriteTableHeader (
 
     /* Table length. Checksum zero for now, will rewrite later */
 
-    DWord = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength;
-    ACPI_MOVE_32_TO_32(&TableHeader.Length, &DWord);
+    TableHeader.Length = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength;
 
     /* Calculate the comment lengths for this definition block parseOp */
 
@@ -539,6 +538,8 @@ CgWriteTableHeader (
         CvDbgPrint ("    Length: %u\n", CommentLength);
         }
     }
+    DWord = TableHeader.Length;
+    ACPI_MOVE_32_TO_32(&TableHeader.Length, &DWord);
 
     TableHeader.Checksum = 0;