diff --git a/Generals/Code/GameEngine/Include/Common/BitFlags.h b/Generals/Code/GameEngine/Include/Common/BitFlags.h
index ed6bee9fd2..db1dfeca9b 100644
--- a/Generals/Code/GameEngine/Include/Common/BitFlags.h
+++ b/Generals/Code/GameEngine/Include/Common/BitFlags.h
@@ -257,7 +257,7 @@ class BitFlags
 	UnsignedInt toUnsignedInt() const noexcept
 	{
 		UnsignedInt val = 0;
-		const UnsignedInt count = min(m_bits.size(), sizeof(val) * 8);
+		const UnsignedInt count = (m_bits.size() < sizeof(val) * 8) ? m_bits.size() : sizeof(val) * 8;
 		for (UnsignedInt i = 0; i < count; ++i)
 			val |= m_bits.test(i) * (1u << i);
 		return val;
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h b/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h
index 0e06ee8d38..216eb7526f 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h
@@ -257,7 +257,7 @@ class BitFlags
 	UnsignedInt toUnsignedInt() const noexcept
 	{
 		UnsignedInt val = 0;
-		const UnsignedInt count = min(m_bits.size(), sizeof(val) * 8);
+		const UnsignedInt count = (m_bits.size() < sizeof(val) * 8) ? m_bits.size() : sizeof(val) * 8;
 		for (UnsignedInt i = 0; i < count; ++i)
 			val |= m_bits.test(i) * (1u << i);
 		return val;