diff --git a/common/lib/elf.c b/common/lib/elf.c
index 89f78067..482a5cb7 100644
--- a/common/lib/elf.c
+++ b/common/lib/elf.c
@@ -311,7 +311,6 @@ struct elf_section_hdr_info* elf64_section_hdr_info(uint8_t *elf) {
 
     info->num = hdr.sh_num;
     info->section_entry_size = hdr.shdr_size;
-    info->section_hdr_size = info->num * info->section_entry_size;
     info->str_section_idx = hdr.shstrndx;
     info->section_offset = hdr.shoff;
 
@@ -328,7 +327,6 @@ struct elf_section_hdr_info* elf32_section_hdr_info(uint8_t *elf) {
 
     info->num = hdr.sh_num;
     info->section_entry_size = hdr.shdr_size;
-    info->section_hdr_size = info->num * info->section_entry_size;
     info->str_section_idx = hdr.shstrndx;
     info->section_offset = hdr.shoff;
 
diff --git a/common/lib/elf.h b/common/lib/elf.h
index fc099bdd..6c91e2c7 100644
--- a/common/lib/elf.h
+++ b/common/lib/elf.h
@@ -18,7 +18,6 @@ struct elf_range {
 };
 
 struct elf_section_hdr_info {
-    uint32_t section_hdr_size;
     uint32_t section_entry_size;
     uint32_t str_section_idx;
     uint32_t num;
diff --git a/common/protos/multiboot2.c b/common/protos/multiboot2.c
index 79189e4d..c9b5ee8d 100644
--- a/common/protos/multiboot2.c
+++ b/common/protos/multiboot2.c
@@ -26,7 +26,7 @@
 static size_t get_multiboot2_info_size(
     char *cmdline,
     size_t modules_size,
-    uint32_t section_hdr_size, uint32_t section_num,
+    uint32_t section_entry_size, uint32_t section_num,
     uint32_t smbios_tag_size
 ) {
     return ALIGN_UP(sizeof(struct multiboot2_start_tag), MULTIBOOT_TAG_ALIGN) +                                         // start
@@ -35,7 +35,7 @@ static size_t get_multiboot2_info_size(
         ALIGN_UP(sizeof(struct multiboot_tag_framebuffer), MULTIBOOT_TAG_ALIGN) +                                       // framebuffer
         ALIGN_UP(sizeof(struct multiboot_tag_new_acpi) + sizeof(struct rsdp), MULTIBOOT_TAG_ALIGN) +                    // new ACPI info
         ALIGN_UP(sizeof(struct multiboot_tag_old_acpi) + 20, MULTIBOOT_TAG_ALIGN) +                                     // old ACPI info
-        ALIGN_UP(sizeof(struct multiboot_tag_elf_sections) + section_hdr_size * section_num, MULTIBOOT_TAG_ALIGN) +                   // ELF info
+        ALIGN_UP(sizeof(struct multiboot_tag_elf_sections) + section_entry_size * section_num, MULTIBOOT_TAG_ALIGN) +                   // ELF info
         ALIGN_UP(modules_size, MULTIBOOT_TAG_ALIGN) +                                                                   // modules
         ALIGN_UP(smbios_tag_size, MULTIBOOT_TAG_ALIGN) +                                                                // SMBIOS
         ALIGN_UP(sizeof(struct multiboot_tag_basic_meminfo), MULTIBOOT_TAG_ALIGN) +                                     // basic memory info
@@ -286,7 +286,8 @@ bool multiboot2_load(char *config, char* cmdline) {
     size_t mb2_info_size = get_multiboot2_info_size(
         cmdline,
         modules_size,
-        section_hdr_info ? section_hdr_info->section_hdr_size : 0, section_hdr_info->num,
+        section_hdr_info ? section_hdr_info->section_entry_size * section_hdr_info->num : 0,
+        section_hdr_info ? section_hdr_info->num : 0,
         smbios_tag_size
     );
 
@@ -304,7 +305,7 @@ bool multiboot2_load(char *config, char* cmdline) {
             panic(true, "multiboot2: Cannot return ELF file information");
         }
     } else {
-        uint32_t size = sizeof(struct multiboot_tag_elf_sections) + section_hdr_info->section_hdr_size * section_hdr_info->num;
+        uint32_t size = sizeof(struct multiboot_tag_elf_sections) + section_hdr_info->section_entry_size * section_hdr_info->num;
         struct multiboot_tag_elf_sections *tag = (struct multiboot_tag_elf_sections*)(mb2_info + info_idx);
 
         tag->type = MULTIBOOT_TAG_TYPE_ELF_SECTIONS;
@@ -314,7 +315,7 @@ bool multiboot2_load(char *config, char* cmdline) {
         tag->entsize = section_hdr_info->section_entry_size;
         tag->shndx = section_hdr_info->str_section_idx;
 
-        memcpy(tag->sections, kernel + section_hdr_info->section_offset, section_hdr_info->section_hdr_size * section_hdr_info->num);
+        memcpy(tag->sections, kernel + section_hdr_info->section_offset, section_hdr_info->section_entry_size * section_hdr_info->num);
 
         for (size_t i = 0; i < section_hdr_info->num; i++) {
             struct elf64_shdr *shdr = (void *)kernel + section_hdr_info->section_offset + i * section_hdr_info->section_entry_size;