diff --git a/source/RobotAPI/libraries/armem_gui/instance/display_visitors/TypedDataDisplayVisitor.cpp b/source/RobotAPI/libraries/armem_gui/instance/display_visitors/TypedDataDisplayVisitor.cpp
index 6e2e92a7cea71f53f2eb16f4ea369f53176f7079..5e3f89be8c976e25b488935a6b799631fdbc982f 100644
--- a/source/RobotAPI/libraries/armem_gui/instance/display_visitors/TypedDataDisplayVisitor.cpp
+++ b/source/RobotAPI/libraries/armem_gui/instance/display_visitors/TypedDataDisplayVisitor.cpp
@@ -104,7 +104,9 @@ namespace armarx::aron
     TypedDataDisplayVisitor::processMatrix(const type::Matrix& type, const data::NDArray& data)
     {
         Eigen::Map<Eigen::Matrix<ScalarT, Eigen::Dynamic, Eigen::Dynamic>> m(
-            reinterpret_cast<ScalarT*>(data.getData()), type.getRows(), type.getCols());
+            reinterpret_cast<ScalarT*>(data.getData()),
+            data.getShape().at(0),
+            data.getShape().at(1));
         value << m.format(eigenIof);
     }
 
@@ -161,7 +163,7 @@ namespace armarx::aron
         auto t = *type::Matrix::DynamicCastAndCheck(type);
         auto d = *data::NDArray::DynamicCastAndCheck(data);
 
-        if (std::max(t.getRows(), t.getCols()) > 10)
+        if (std::max(d.getShape().at(0), d.getShape().at(1)) > 10)
         {
             // Just show the shape.
             value << DataDisplayVisitor::getValue(data);