diff --git a/basis/heaps/heaps.factor b/basis/heaps/heaps.factor
index 109d96bd51..dccf1e5e55 100644
--- a/basis/heaps/heaps.factor
+++ b/basis/heaps/heaps.factor
@@ -181,7 +181,7 @@ M: heap heap-pop ( heap -- value key )
 
 : heap-pop-all ( heap -- alist )
     [ dup heap-empty? not ]
-    [ [ heap-pop ] keep 2array ]
+    [ dup heap-pop swap 2array ]
     produce nip ;
 
 ERROR: not-a-heap obj ;