diff --git a/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp b/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp
index c0a8088db7b5ad4e4e1db955b42e9316164038b3..2e52ed4cf4854583641d1a83f85822096d8f5226 100644
--- a/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp
+++ b/source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp
@@ -39,7 +39,6 @@
 #include "../widgets/IntEnumWidget.h"
 #include "../widgets/QuaternionWidget.h"
 
-
 namespace armarx
 {
     bool
@@ -83,7 +82,6 @@ namespace armarx
         aronItem->setValueErrorState(isDirectError, false);
     }
 
-
     void
     AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::ObjectPtr& i)
     {
@@ -152,7 +150,6 @@ namespace armarx
         }
     }
 
-
     void
     AronTreeWidgetConverterVisitor::visitAronVariant(const aron::type::PairPtr& i)
     {
@@ -221,8 +218,28 @@ namespace armarx
                 dataSize = 8;
                 break;
         };
+
+        // UGLY HACK: FIX ME!!!
+        switch (i->getElementType())
+        {
+            case armarx::aron::type::matrix::INT16:
+                createdMatrix->setType("short");
+                break;
+            case armarx::aron::type::matrix::INT32:
+                createdMatrix->setType("int");
+                break;
+            case armarx::aron::type::matrix::FLOAT32:
+                createdMatrix->setType("float");
+                break;
+            case armarx::aron::type::matrix::FLOAT64:
+                createdMatrix->setType("double");
+                break;
+            case armarx::aron::type::matrix::INT64:
+                createdMatrix->setType("long");
+                break;
+        };
+
         createdMatrix->setShape({i->getRows(), i->getCols(), dataSize});
-        createdMatrix->setType(i->getFullName());
         int totalByteSize = i->getRows() * i->getCols() * dataSize;
         createdAron = createdMatrix;