diff --git a/src/amdis/DataTransfer.inc.hpp b/src/amdis/DataTransfer.inc.hpp
index 8d33b5e4fb0786c83d47657f98e039922023f17b..3946f17f9c552ecf19d348ee507020b7a46e9b8c 100644
--- a/src/amdis/DataTransfer.inc.hpp
+++ b/src/amdis/DataTransfer.inc.hpp
@@ -96,8 +96,7 @@ namespace AMDiS
       }
     };
 
-    using ElementData = std::decay_t<decltype(
-      makeTreeContainer<Tree, NodeElementData>(std::declval<const Tree&>(), NodeElementData()))>;
+    using ElementData = TYPEOF(makeTreeContainer<Tree, NodeElementData>(std::declval<const Tree&>(), NodeElementData()));
 
   public:
     // Container with data that persists during grid adaptation