diff --git a/src/core/base_bitset_type.hpp b/src/core/base_bitset_type.hpp
index 9ce8528d31..3b50d4e033 100644
--- a/src/core/base_bitset_type.hpp
+++ b/src/core/base_bitset_type.hpp
@@ -254,8 +254,8 @@ public:
 		return std::nullopt;
 	}
 
-	auto begin() const { return SetBitIterator<Tvalue_type>(this->data).begin(); }
-	auto end() const { return SetBitIterator<Tvalue_type>(this->data).end(); }
+	auto begin() const { return SetBitIterator<Tvalue_type, Tstorage>(this->data).begin(); }
+	auto end() const { return SetBitIterator<Tvalue_type, Tstorage>(this->data).end(); }
 
 private:
 	Tstorage data; ///< Bitmask of values.