diff --git a/libs/math/include/psemek/math/box.hpp b/libs/math/include/psemek/math/box.hpp
index 04b26e82..80c9a944 100644
--- a/libs/math/include/psemek/math/box.hpp
+++ b/libs/math/include/psemek/math/box.hpp
@@ -354,9 +354,9 @@ namespace std
 
 	template <typename T, std::size_t N, typename Char>
 	struct formatter<::psemek::math::box<T, N>, Char>
-		: formatter<::psemek::math::interval<T>>
+		: formatter<::psemek::math::interval<T>, Char>
 	{
-		using formatter<::psemek::math::interval<T>>::parse;
+		using formatter<::psemek::math::interval<T>, Char>::parse;
 
 		template <typename FormatContext>
 		auto format(::psemek::math::box<T, N> const & b, FormatContext & ctx) const
@@ -364,7 +364,7 @@ namespace std
 			for (std::size_t i = 0; i < b.dimension(); ++i)
 			{
 				if (i > 0) ctx.advance_to(std::format_to(ctx.out(), "x"));
-				ctx.advance_to(formatter<::psemek::math::interval<T>>::format(b[i], ctx));
+				ctx.advance_to(formatter<::psemek::math::interval<T>, Char>::format(b[i], ctx));
 			}
 			return ctx.out();
 		}
diff --git a/libs/math/include/psemek/math/interval.hpp b/libs/math/include/psemek/math/interval.hpp
index 352c3163..41d2c804 100644
--- a/libs/math/include/psemek/math/interval.hpp
+++ b/libs/math/include/psemek/math/interval.hpp
@@ -341,17 +341,17 @@ namespace std
 
 	template <typename T, typename Char>
 	struct formatter<::psemek::math::interval<T>, Char>
-		: formatter<T>
+		: formatter<T, Char>
 	{
-		using formatter<T>::parse;
+		using formatter<T, Char>::parse;
 
 		template <typename FormatContext>
 		auto format(::psemek::math::interval<T> const & i, FormatContext & ctx) const
 		{
 			ctx.advance_to(std::format_to(ctx.out(), "["));
-			ctx.advance_to(formatter<T>::format(i.min, ctx));
+			ctx.advance_to(formatter<T, Char>::format(i.min, ctx));
 			ctx.advance_to(std::format_to(ctx.out(), " .. "));
-			ctx.advance_to(formatter<T>::format(i.max, ctx));
+			ctx.advance_to(formatter<T, Char>::format(i.max, ctx));
 			return std::format_to(ctx.out(), "]");
 		}
 	};
diff --git a/libs/math/include/psemek/math/matrix.hpp b/libs/math/include/psemek/math/matrix.hpp
index 46e6006d..a2ee8fcd 100644
--- a/libs/math/include/psemek/math/matrix.hpp
+++ b/libs/math/include/psemek/math/matrix.hpp
@@ -553,9 +553,9 @@ namespace std
 
 	template <typename T, std::size_t R, std::size_t C, typename Char>
 	struct formatter<::psemek::math::matrix<T, R, C>, Char>
-		: formatter<T>
+		: formatter<T, Char>
 	{
-		using formatter<T>::parse;
+		using formatter<T, Char>::parse;
 
 		template <typename FormatContext>
 		auto format(::psemek::math::matrix<T, R, C> const & m, FormatContext & ctx) const
@@ -564,7 +564,7 @@ namespace std
 			{
 				for (std::size_t j = 0; j < m.columns(); ++j)
 				{
-					ctx.advance_to(formatter<T>::format(m[i][j], ctx));
+					ctx.advance_to(formatter<T, Char>::format(m[i][j], ctx));
 					ctx.advance_to(std::format_to(ctx.out(), " "));
 				}
 				ctx.advance_to(std::format_to(ctx.out(), "\n"));
diff --git a/libs/math/include/psemek/math/point.hpp b/libs/math/include/psemek/math/point.hpp
index 2e2af0d8..d1dc97c1 100644
--- a/libs/math/include/psemek/math/point.hpp
+++ b/libs/math/include/psemek/math/point.hpp
@@ -308,9 +308,9 @@ namespace std
 
 	template <typename T, std::size_t N, typename Char>
 	struct formatter<::psemek::math::point<T, N>, Char>
-		: formatter<T>
+		: formatter<T, Char>
 	{
-		using formatter<T>::parse;
+		using formatter<T, Char>::parse;
 
 		template <typename FormatContext>
 		auto format(::psemek::math::point<T, N> const & p, FormatContext & ctx) const
@@ -325,7 +325,7 @@ namespace std
 				for (std::size_t i = 0; i < p.dimension(); ++i)
 				{
 					if (i > 0) ctx.advance_to(std::format_to(ctx.out(), ", "));
-					ctx.advance_to(formatter<T>::format(p[i], ctx));
+					ctx.advance_to(formatter<T, Char>::format(p[i], ctx));
 				}
 				return std::format_to(ctx.out(), ")");
 			}
diff --git a/libs/math/include/psemek/math/vector.hpp b/libs/math/include/psemek/math/vector.hpp
index 908b0539..977f244a 100644
--- a/libs/math/include/psemek/math/vector.hpp
+++ b/libs/math/include/psemek/math/vector.hpp
@@ -548,9 +548,9 @@ namespace std
 
 	template <typename T, std::size_t N, typename Char>
 	struct formatter<::psemek::math::vector<T, N>, Char>
-		: formatter<T>
+		: formatter<T, Char>
 	{
-		using formatter<T>::parse;
+		using formatter<T, Char>::parse;
 
 		template <typename FormatContext>
 		auto format(::psemek::math::vector<T, N> const & v, FormatContext & ctx) const
@@ -565,7 +565,7 @@ namespace std
 				for (std::size_t i = 0; i < v.dimension(); ++i)
 				{
 					if (i > 0) ctx.advance_to(std::format_to(ctx.out(), ", "));
-					ctx.advance_to(formatter<T>::format(v[i], ctx));
+					ctx.advance_to(formatter<T, Char>::format(v[i], ctx));
 				}
 				return std::format_to(ctx.out(), ")");
 			}