diff --git a/libs/math/include/psemek/math/matrix.hpp b/libs/math/include/psemek/math/matrix.hpp
index ecc5cfa3..15d9d032 100644
--- a/libs/math/include/psemek/math/matrix.hpp
+++ b/libs/math/include/psemek/math/matrix.hpp
@@ -3,7 +3,7 @@
 #include <psemek/math/detail/array_2d.hpp>
 #include <psemek/math/vector.hpp>
 #include <psemek/math/math.hpp>
-#include <psemek/util/range.hpp>
+#include <psemek/util/span.hpp>
 
 #include <iostream>
 #include <iomanip>
@@ -55,14 +55,14 @@ namespace psemek::math
 			return coords[i];
 		}
 
-		util::range<T *> values()
+		util::span<T> values()
 		{
-			return {&coords[0][0], &coords[0][0] + rows() * columns()};
+			return {&coords[0][0], rows() * columns()};
 		}
 
-		util::range<T const *> values() const
+		util::span<T const> values() const
 		{
-			return {&coords[0][0], &coords[0][0] + rows() * columns()};
+			return {&coords[0][0], rows() * columns()};
 		}
 
 		matrix copy() const