diff --git a/elfloader-tool/include/arch-arm/64/mode/structures.h b/elfloader-tool/include/arch-arm/64/mode/structures.h
index f77ef93d..aaa8bced 100644
--- a/elfloader-tool/include/arch-arm/64/mode/structures.h
+++ b/elfloader-tool/include/arch-arm/64/mode/structures.h
@@ -21,9 +21,9 @@
 #define PMD_BITS                9
 #define PMD_SIZE_BITS           (PMD_BITS + PMDE_SIZE_BITS)
 
-#define GET_PGD_INDEX(x)        (((x) >> (ARM_2MB_BLOCK_BITS + PMD_BITS + PUD_BITS)) & MASK(PGD_BITS))
-#define GET_PUD_INDEX(x)        (((x) >> (ARM_2MB_BLOCK_BITS + PMD_BITS)) & MASK(PUD_BITS))
-#define GET_PMD_INDEX(x)        (((x) >> (ARM_2MB_BLOCK_BITS)) & MASK(PMD_BITS))
+#define GET_PGD_INDEX(x)        (((word_t)(x) >> (ARM_2MB_BLOCK_BITS + PMD_BITS + PUD_BITS)) & MASK(PGD_BITS))
+#define GET_PUD_INDEX(x)        (((word_t)(x) >> (ARM_2MB_BLOCK_BITS + PMD_BITS)) & MASK(PUD_BITS))
+#define GET_PMD_INDEX(x)        (((word_t)(x) >> (ARM_2MB_BLOCK_BITS)) & MASK(PMD_BITS))
 
 extern uint64_t _boot_pgd_up[BIT(PGD_BITS)];
 extern uint64_t _boot_pud_up[BIT(PUD_BITS)];