diff --git a/src/common/bit_field.h b/src/common/bit_field.h
index 52f0d8be6..b6f0179c6 100644
--- a/src/common/bit_field.h
+++ b/src/common/bit_field.h
@@ -142,7 +142,7 @@ public:
 
     __forceinline BitField& operator=(T val)
     {
-        storage = (storage & ~GetMask()) | ((val << position) & GetMask());
+        storage = (storage & ~GetMask()) | (((StorageType)val << position) & GetMask());
         return *this;
     }