1 files changed, 2 insertions, 2 deletions
diff --git a/hyper/process/spawn b/hyper/process/spawn
index a0043ec7..c2b829ca 100755
--- a/hyper/process/spawn
+++ b/hyper/process/spawn
@@ -53,7 +53,6 @@ spawn() {
 defer() {
   defer="$*${defer+
 $defer}"
-  trap "$defer" EXIT
 }
 
 #
@@ -64,7 +63,8 @@ $defer}"
 #
 cancel() {
   defer="`echo "$defer" | grep -Fxv "$*"`"
-  trap "$defer" EXIT
 }
 
+# setup deferred execution and spawn command
+trap 'eval "${defer-}"; defer=' EXIT INT
 spawn "$@"