diff --git a/Source/RWTHVRCluster/Public/Events/DisplayClusterEventParameterHelper.h b/Source/RWTHVRCluster/Public/Events/DisplayClusterEventParameterHelper.h
index 56c17d2a0f1f03543ad4bace490edae0269045ec..85b7f8e157cb3ebede2d0f72f77a1ce19b9c2dd0 100644
--- a/Source/RWTHVRCluster/Public/Events/DisplayClusterEventParameterHelper.h
+++ b/Source/RWTHVRCluster/Public/Events/DisplayClusterEventParameterHelper.h
@@ -7,7 +7,7 @@
 template <typename ParameterType, typename... RemainingParameterTypes>
 inline void SerializeParameters(FMemoryWriter* MemoryWriter, ParameterType&& Parameter, RemainingParameterTypes&&... RemainingParameters)
 { 
-	using NonConstType = typename std::remove_cv_t<typename TRemoveReference<ParameterType>::Type>::Type;
+	using NonConstType = typename std::remove_cv_t<typename TRemoveReference<ParameterType>::Type>;
 	(*MemoryWriter) << const_cast<NonConstType&>(Parameter); // const_cast because the same operator (<<) is used for reading and writing
 	SerializeParameters(MemoryWriter, Forward<RemainingParameterTypes>(RemainingParameters)...);
 }
diff --git a/Source/RWTHVRCluster/Public/Events/DisplayClusterEventWrapper.h b/Source/RWTHVRCluster/Public/Events/DisplayClusterEventWrapper.h
index e44f5de344189ab4b1762bb5aaf3330e14842cdf..fec87393ed1129e02e1a01bf2dc7d8310dbfb934 100644
--- a/Source/RWTHVRCluster/Public/Events/DisplayClusterEventWrapper.h
+++ b/Source/RWTHVRCluster/Public/Events/DisplayClusterEventWrapper.h
@@ -63,7 +63,7 @@ public:
 				// Create a tuple that holds all arguments. This assumes that all
 				// argument types are default constructible. However, all
 				// types that overload the FArchive "<<" operator probably are.
-				TTuple<typename std::remove_cv_t<typename TRemoveReference<ArgTypes>::Type>::Type...> ArgumentTuple;
+				TTuple<typename std::remove_cv_t<typename TRemoveReference<ArgTypes>::Type>...> ArgumentTuple;
 
 				// This call will deserialze the values and fill all values in the tuple appropriately.
 				FillArgumentTuple<0>(&MemoryReader, &ArgumentTuple);