diff --git a/include/beman/execution/detail/when_all.hpp b/include/beman/execution/detail/when_all.hpp
index 0af45779..40f130f7 100644
--- a/include/beman/execution/detail/when_all.hpp
+++ b/include/beman/execution/detail/when_all.hpp
@@ -35,6 +35,7 @@
 #include <beman/execution/detail/transform_sender.hpp>
 #include <beman/execution/detail/type_list.hpp>
 #include <beman/execution/detail/value_types_of_t.hpp>
+#include <beman/execution/detail/sends_stopped.hpp>
 
 #include <concepts>
 #include <exception>
@@ -250,7 +251,11 @@ struct completion_signatures_for_impl<
             type;
     using error_types = ::beman::execution::detail::meta::unique<
         ::beman::execution::detail::meta::combine<::beman::execution::error_types_of_t<Sender, Env, error_comps>...>>;
-    using type = ::beman::execution::detail::meta::combine<value_types, error_types>;
+    using stopped_types =
+        ::std::conditional_t<(false || ... || ::beman::execution::sends_stopped<Sender, Env>),
+                             ::beman::execution::completion_signatures<::beman::execution::set_stopped_t()>,
+                             ::beman::execution::completion_signatures<>>;
+    using type = ::beman::execution::detail::meta::combine<value_types, error_types, stopped_types>;
 };
 } // namespace beman::execution::detail
 
diff --git a/src/beman/execution/CMakeLists.txt b/src/beman/execution/CMakeLists.txt
index ea6aecae..c55afcc4 100644
--- a/src/beman/execution/CMakeLists.txt
+++ b/src/beman/execution/CMakeLists.txt
@@ -27,6 +27,8 @@ target_sources(
          ${PROJECT_SOURCE_DIR}/include/beman/execution/execution.hpp
          ${PROJECT_SOURCE_DIR}/include/beman/execution/functional.hpp
          ${PROJECT_SOURCE_DIR}/include/beman/execution/stop_token.hpp
+         ${PROJECT_SOURCE_DIR}/include/beman/execution26/execution.hpp
+         ${PROJECT_SOURCE_DIR}/include/beman/execution26/stop_token.hpp
   PUBLIC FILE_SET
          ${TARGET_NAME}_detail_headers
          TYPE
@@ -47,6 +49,7 @@ target_sources(
          ${PROJECT_SOURCE_DIR}/include/beman/execution/detail/basic_receiver.hpp
          ${PROJECT_SOURCE_DIR}/include/beman/execution/detail/basic_sender.hpp
          ${PROJECT_SOURCE_DIR}/include/beman/execution/detail/basic_state.hpp
+         ${PROJECT_SOURCE_DIR}/include/beman/execution/detail/bulk.hpp
          ${PROJECT_SOURCE_DIR}/include/beman/execution/detail/call_result_t.hpp
          ${PROJECT_SOURCE_DIR}/include/beman/execution/detail/callable.hpp
          ${PROJECT_SOURCE_DIR}/include/beman/execution/detail/check_type_alias_exist.hpp