diff --git a/include/sp/protocol/MessageFactory.h b/include/sp/protocol/MessageFactory.h
index 0957977..e14a409 100644
--- a/include/sp/protocol/MessageFactory.h
+++ b/include/sp/protocol/MessageFactory.h
@@ -19,7 +19,7 @@ class MessageFactory {
 		m_Factory.resize(messageCount);
 		TupleForEach([this](const auto& message){
 			std::size_t messageID = static_cast<std::size_t>(message.GetId());
-			using MessageType = std::remove_const_t<std::remove_reference_t<decltype(message)>>;
+			using MessageType = std::decay_t<decltype(message)>;
 			m_Factory.emplace(m_Factory.begin() + messageID, []() -> std::unique_ptr<TBase> { return std::make_unique<MessageType>(); });
 		}, TTMessages{});
 	}