diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
index 7a0f08c6a7..9146a5282f 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Future.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala
@@ -292,7 +292,7 @@ object Future {
    * The Delimited Continuations compiler plugin must be enabled in order to use this method.
    */
   def flow[A](body: => A @cps[Future[Any]], timeout: Long = Actor.TIMEOUT): Future[A] = {
-    val future = new DefaultCompletableFuture[A](timeout)
+    val future = Promise[A](timeout)
     (reset(future.asInstanceOf[CompletableFuture[Any]].completeWithResult(body)): Future[Any]) onComplete { f =>
       val opte = f.exception
       if (opte.isDefined) future completeWithException (opte.get)
@@ -613,6 +613,14 @@ sealed trait Future[+T] {
 
 }
 
+object Promise {
+
+  def apply[A](timeout: Long): CompletableFuture[A] = new DefaultCompletableFuture[A](timeout)
+
+  def apply[A](): CompletableFuture[A] = apply(Actor.TIMEOUT)
+
+}
+
 /**
  * Essentially this is the Promise (or write-side) of a Future (read-side).
  */