diff --git a/include/Nazara/Math/Algorithm.hpp b/include/Nazara/Math/Algorithm.hpp
index 45281bb50..f138a8fc9 100644
--- a/include/Nazara/Math/Algorithm.hpp
+++ b/include/Nazara/Math/Algorithm.hpp
@@ -37,7 +37,7 @@ namespace Nz
 {
 	template<typename T> /*constexpr*/ T Approach(T value, T objective, T increment);
 	template<typename T> constexpr T Clamp(T value, T min, T max);
-	template<typename T> /*constexpr*/ T CountBits(T value);
+	template<typename T> /*constexpr*/ std::size_t CountBits(T value);
 	template<typename T> constexpr T FromDegrees(T degrees);
 	template<typename T> constexpr T FromRadians(T radians);
 	template<typename T> constexpr T DegreeToRadian(T degrees);
diff --git a/include/Nazara/Math/Algorithm.inl b/include/Nazara/Math/Algorithm.inl
index b61d82916..02ede739a 100644
--- a/include/Nazara/Math/Algorithm.inl
+++ b/include/Nazara/Math/Algorithm.inl
@@ -147,10 +147,10 @@ namespace Nz
 
 	template<typename T>
 	//TODO: Mark as constexpr when supported by all major compilers
-	/*constexpr*/ inline T CountBits(T value)
+	/*constexpr*/ inline std::size_t CountBits(T value)
 	{
 		// https://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetKernighan
-		unsigned int count = 0;
+		std::size_t count = 0;
 		while (value)
 		{
 			value &= value - 1;