diff --git a/cffu-core/src/main/java/io/foldright/cffu/Cffu.java b/cffu-core/src/main/java/io/foldright/cffu/Cffu.java
index f26f175d..621739b2 100644
--- a/cffu-core/src/main/java/io/foldright/cffu/Cffu.java
+++ b/cffu-core/src/main/java/io/foldright/cffu/Cffu.java
@@ -1198,7 +1198,7 @@ public Cffu<T> exceptionallyComposeAsync(
      * @param <U> the function's return type
      * @return the new Cffu
      */
-    @CheckReturnValue(explanation = "should use the returned Cffu; otherwise, prefer method `whenComplete`")
+    @CheckReturnValue(explanation = "should use the returned Cffu; otherwise, prefer method `peek`")
     @Override
     public <U> Cffu<U> handle(BiFunction<? super T, Throwable, ? extends U> fn) {
         return reset0(cf.handle(fn));
@@ -1217,7 +1217,7 @@ public <U> Cffu<U> handle(BiFunction<? super T, Throwable, ? extends U> fn) {
      * @param <U> the function's return type
      * @return the new Cffu
      */
-    @CheckReturnValue(explanation = "should use the returned Cffu; otherwise, prefer method `whenCompleteAsync`")
+    @CheckReturnValue(explanation = "should use the returned Cffu; otherwise, prefer method `peekAsync`")
     @Override
     public <U> Cffu<U> handleAsync(BiFunction<? super T, Throwable, ? extends U> fn) {
         return handleAsync(fn, fac.defaultExecutor());
@@ -1237,7 +1237,7 @@ public <U> Cffu<U> handleAsync(BiFunction<? super T, Throwable, ? extends U> fn)
      * @param <U>      the function's return type
      * @return the new Cffu
      */
-    @CheckReturnValue(explanation = "should use the returned Cffu; otherwise, prefer method `whenCompleteAsync`")
+    @CheckReturnValue(explanation = "should use the returned Cffu; otherwise, prefer method `peekAsync`")
     @Override
     public <U> Cffu<U> handleAsync(
             BiFunction<? super T, Throwable, ? extends U> fn, Executor executor) {
@@ -1263,6 +1263,7 @@ public <U> Cffu<U> handleAsync(
      * @return the new Cffu
      */
     @Override
+    @CheckReturnValue(explanation = "should use the returned Cffu; otherwise, prefer method `peek`")
     public Cffu<T> whenComplete(BiConsumer<? super T, ? super Throwable> action) {
         return reset0(cf.whenComplete(action));
     }
@@ -1288,6 +1289,7 @@ public Cffu<T> whenComplete(BiConsumer<? super T, ? super Throwable> action) {
      * @return the new Cffu
      */
     @Override
+    @CheckReturnValue(explanation = "should use the returned Cffu; otherwise, prefer method `peekAsync`")
     public Cffu<T> whenCompleteAsync(BiConsumer<? super T, ? super Throwable> action) {
         return whenCompleteAsync(action, fac.defaultExecutor());
     }
@@ -1313,6 +1315,7 @@ public Cffu<T> whenCompleteAsync(BiConsumer<? super T, ? super Throwable> action
      * @return the new Cffu
      */
     @Override
+    @CheckReturnValue(explanation = "should use the returned Cffu; otherwise, prefer method `peekAsync`")
     public Cffu<T> whenCompleteAsync(BiConsumer<? super T, ? super Throwable> action, Executor executor) {
         return reset0(cf.whenCompleteAsync(action, executor));
     }
@@ -1334,7 +1337,7 @@ public Cffu<T> whenCompleteAsync(BiConsumer<? super T, ? super Throwable> action
      * @see java.util.stream.Stream#peek(Consumer)
      */
     public Cffu<T> peek(BiConsumer<? super T, ? super Throwable> action) {
-        cf.whenComplete(action);
+        CompletableFutureUtils.peek(cf, action);
         return this;
     }
 
@@ -1377,7 +1380,7 @@ public Cffu<T> peekAsync(BiConsumer<? super T, ? super Throwable> action) {
      * @see java.util.stream.Stream#peek(Consumer)
      */
     public Cffu<T> peekAsync(BiConsumer<? super T, ? super Throwable> action, Executor executor) {
-        cf.whenCompleteAsync(action, executor);
+        CompletableFutureUtils.peekAsync(cf, action, executor);
         return this;
     }