diff --git a/arch/arm64/kernel/memory.c b/arch/arm64/kernel/memory.c
index 4fecd35c..7e18acca 100644
--- a/arch/arm64/kernel/memory.c
+++ b/arch/arm64/kernel/memory.c
@@ -1205,9 +1205,15 @@ uint64_t ihk_mc_pt_virt_to_pagemap(struct page_table *pt, unsigned long virt)
 	}
 	if (ptl3_type_block(ptep)) {
 		paddr = ptl3_phys(ptep);
-		size = PTL3_SIZE;
-		mask = PTL3_MASK;
-		shift = PTL3_SHIFT;
+		if (pte_is_contiguous(ptep)) {
+			size = PTL3_CONT_SIZE;
+			mask = PTL3_CONT_MASK;
+			shift = PTL3_CONT_SHIFT;
+		} else {
+			size = PTL3_SIZE;
+			mask = PTL3_MASK;
+			shift = PTL3_SHIFT;
+		}
 		goto out;
 	}
 
@@ -1217,9 +1223,15 @@ uint64_t ihk_mc_pt_virt_to_pagemap(struct page_table *pt, unsigned long virt)
 	}
 	if (ptl2_type_block(ptep)) {
 		paddr = ptl2_phys(ptep);
-		size = PTL2_SIZE;
-		mask = PTL2_MASK;
-		shift = PTL2_SHIFT;
+		if (pte_is_contiguous(ptep)) {
+			size = PTL2_CONT_SIZE;
+			mask = PTL2_CONT_MASK;
+			shift = PTL2_CONT_SHIFT;
+		} else {
+			size = PTL2_SIZE;
+			mask = PTL2_MASK;
+			shift = PTL2_SHIFT;
+		}
 		goto out;
 	}
 
@@ -1228,9 +1240,15 @@ uint64_t ihk_mc_pt_virt_to_pagemap(struct page_table *pt, unsigned long virt)
 		return ret;
 	}
 	paddr = ptl1_phys(ptep);
-	size = PTL1_SIZE;
-	mask = PTL1_MASK;
-	shift = PTL1_SHIFT;
+	if (pte_is_contiguous(ptep)) {
+		size = PTL1_CONT_SIZE;
+		mask = PTL1_CONT_MASK;
+		shift = PTL1_CONT_SHIFT;
+	} else {
+		size = PTL1_SIZE;
+		mask = PTL1_MASK;
+		shift = PTL1_SHIFT;
+	}
 out:
 	ret = PM_PFRAME(((paddr & mask) + (v & (size - 1))) >> PAGE_SHIFT);
 	ret |= PM_PSHIFT(shift) | PM_PRESENT;