diff --git a/extra/concurrency/concurrency-tests.factor b/extra/concurrency/concurrency-tests.factor
index 1a19ce7096..8908506d51 100755
--- a/extra/concurrency/concurrency-tests.factor
+++ b/extra/concurrency/concurrency-tests.factor
@@ -133,4 +133,9 @@ SYMBOL: value
 [ 3 3 ] [
     [ 3 ] future
     dup ?future swap ?future
+] unit-test
+
+! Another race
+[ 3 ] [
+    [ 3 yield ] future ?future
 ] unit-test
\ No newline at end of file
diff --git a/extra/concurrency/concurrency.factor b/extra/concurrency/concurrency.factor
index a8e0bc6eeb..1c5f6322a8 100755
--- a/extra/concurrency/concurrency.factor
+++ b/extra/concurrency/concurrency.factor
@@ -273,14 +273,14 @@ TUPLE: future value processes ;
 
 : future ( quot -- future )
     #! Spawn a process to call the quotation and immediately return.
-    \ future construct-empty [
+    f V{ } clone \ future construct-boa [
         [
             >r [ t 2array ] compose [ f 2array ] recover r>
             notify-future
         ] 2curry spawn drop
     ] keep ;
- 
- : ?future ( future -- result )
+
+: ?future ( future -- result )
     #! Block the process until the future has completed and then
     #! place the result on the stack. Return the result
     #! immediately if the future has completed.