diff --git a/src/lib.rs b/src/lib.rs
index c939335..496681c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -747,7 +747,7 @@
             }
             DescriptorType::Block => {
                 // Saving current descriptor details
-                let current_va = va.mask_for_level(granule, level);
+                let current_va = va.mask_bits(!(granule.block_size_at_level(level) - 1));
                 let current_pa = descriptor.get_block_output_address(granule, level);
                 let current_attributes = descriptor.get_block_attributes(level);
 
@@ -798,7 +798,7 @@
                 let result = Self::set_block_descriptor_recursively(
                     attributes,
                     pa,
-                    va.mask_for_level(granule, level + 1),
+                    va.mask_for_level(granule, level),
                     block_size,
                     level + 1,
                     next_table,