diff --git a/libs/ecs/include/psemek/ecs/detail/table_container.hpp b/libs/ecs/include/psemek/ecs/detail/table_container.hpp
index 2b86215d..a103516a 100644
--- a/libs/ecs/include/psemek/ecs/detail/table_container.hpp
+++ b/libs/ecs/include/psemek/ecs/detail/table_container.hpp
@@ -12,7 +12,7 @@ namespace psemek::ecs::detail
 	struct table_container
 	{
 		template <typename ... Components>
-		std::pair<table_impl<Components...> *, bool> insert(component_mask const & mask, util::span<util::uuid const> component_uuids);
+		std::pair<table *, bool> insert(component_mask const & mask, util::span<util::uuid const> component_uuids);
 
 		template <typename Function>
 		void apply(Function && function, component_mask const & mask);
@@ -22,7 +22,7 @@ namespace psemek::ecs::detail
 	};
 
 	template <typename ... Components>
-	std::pair<table_impl<Components...> *, bool> table_container::insert(component_mask const & mask, util::span<util::uuid const> component_uuids)
+	std::pair<table *, bool> table_container::insert(component_mask const & mask, util::span<util::uuid const> component_uuids)
 	{
 		auto & result = tables_[mask];
 		bool created = false;
@@ -31,7 +31,7 @@ namespace psemek::ecs::detail
 			result = std::make_unique<table_impl<Components...>>(component_uuids);
 			created = true;
 		}
-		return {static_cast<table_impl<Components...> *>(result.get()), created};
+		return {result.get(), created};
 	}
 
 	template <typename Function>