diff --git a/src/core/enum_type.hpp b/src/core/enum_type.hpp
index 851dd5618f..804a04fb80 100644
--- a/src/core/enum_type.hpp
+++ b/src/core/enum_type.hpp
@@ -144,7 +144,7 @@ public:
 	 */
 	inline constexpr EnumBitSet &Set(Tenum value)
 	{
-		this->data |= (1U << to_underlying(value));
+		this->data |= (1ULL << to_underlying(value));
 		return *this;
 	}
 
@@ -155,7 +155,7 @@ public:
 	 */
 	inline constexpr EnumBitSet &Reset(Tenum value)
 	{
-		this->data &= ~(1U << to_underlying(value));
+		this->data &= ~(1ULL << to_underlying(value));
 		return *this;
 	}
 
@@ -180,7 +180,7 @@ public:
 	 */
 	inline constexpr bool Test(Tenum value) const
 	{
-		return (this->data & (1U << to_underlying(value))) != 0;
+		return (this->data & (1ULL << to_underlying(value))) != 0;
 	}
 
 	/**