diff --git a/libs/ecs/include/psemek/ecs/container.hpp b/libs/ecs/include/psemek/ecs/container.hpp
index 9a67ee88..65606fa8 100644
--- a/libs/ecs/include/psemek/ecs/container.hpp
+++ b/libs/ecs/include/psemek/ecs/container.hpp
@@ -628,7 +628,7 @@ namespace psemek::ecs
 	{
 		static_assert(detail::all_different_types_v<std::remove_const_t<Components>...>, "all component types must be different");
 
-		using invocable_type = typename detail::filter_with<detail::invocable, std::tuple<Components const ...>, Function>::type;
+		using invocable_type = typename detail::filter_with<detail::invocable, std::tuple<Components ...>, Function>::type;
 
 		static_assert(invocable_type::value, "function is not invocable with these components");
 
@@ -636,7 +636,7 @@ namespace psemek::ecs
 
 		cache->constructor_factory = [function = std::move(function)](std::vector<std::uint32_t> const & column_indices) -> detail::table_callback {
 			return [function, column_indices](container & container, detail::table & table, std::uint32_t row){
-				typename detail::filter_with<detail::static_apply_helper, std::tuple<Components const ...>>::type apply_helper(container, table.entity_handles());
+				typename detail::filter_with<detail::static_apply_helper, std::tuple<Components ...>>::type apply_helper(container, table.entity_handles());
 
 				for (std::size_t i = 0; i < apply_helper.column_count; ++i)
 					apply_helper.pointers[i] = table.columns()[column_indices[i]]->data();
@@ -654,7 +654,7 @@ namespace psemek::ecs
 	{
 		static_assert(detail::all_different_types_v<std::remove_const_t<Components>...>, "all component types must be different");
 
-		using invocable_type = typename detail::filter_with<detail::invocable, std::tuple<Components const ...>, Function>::type;
+		using invocable_type = typename detail::filter_with<detail::invocable, std::tuple<Components ...>, Function>::type;
 
 		static_assert(invocable_type::value, "function is not invocable with these components");
 
@@ -662,7 +662,7 @@ namespace psemek::ecs
 
 		cache->destructor_factory = [function = std::move(function)](std::vector<std::uint32_t> const & column_indices) -> detail::table_callback {
 			return [function, column_indices](container & container, detail::table & table, std::uint32_t row){
-				typename detail::filter_with<detail::static_apply_helper, std::tuple<Components const ...>>::type apply_helper(container, table.entity_handles());
+				typename detail::filter_with<detail::static_apply_helper, std::tuple<Components ...>>::type apply_helper(container, table.entity_handles());
 
 				for (std::size_t i = 0; i < apply_helper.column_count; ++i)
 					apply_helper.pointers[i] = table.columns()[column_indices[i]]->data();