2 files changed, 7 insertions, 4 deletions
diff --git a/libs/multiboot2/include/multiboot2/impl/data.hpp b/libs/multiboot2/include/multiboot2/impl/data.hpp
index 367e8cb..a5f2e14 100644
--- a/libs/multiboot2/include/multiboot2/impl/data.hpp
+++ b/libs/multiboot2/include/multiboot2/impl/data.hpp
@@ -99,17 +99,17 @@ namespace multiboot2::impl
       /**
        * @brief Start address of this region
        */
-      std::uint64_t const base;
+      std::uint64_t base;
 
       /**
        * @brief Size of this region in bytes.
        */
-      std::uint64_t const size_in_B;
+      std::uint64_t size_in_B;
 
       /**
        * @brief Type of this region.
        */
-      memory_type const type;
+      memory_type type;
 
       std::uint32_t : 0;
     };
diff --git a/libs/multiboot2/include/multiboot2/impl/iterator.hpp b/libs/multiboot2/include/multiboot2/impl/iterator.hpp
index b84ef2c..e82326d 100644
--- a/libs/multiboot2/include/multiboot2/impl/iterator.hpp
+++ b/libs/multiboot2/include/multiboot2/impl/iterator.hpp
@@ -40,7 +40,10 @@ namespace multiboot2::impl
         {
           m_current = next;
         }
-        m_current.reset();
+        else
+        {
+          m_current.reset();
+        }
       }
       return *this;
     }