diff --git a/gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64 b/gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64
new file mode 100755
index 00000000..cc30c089
Binary files /dev/null and b/gitstatus/bin/gitstatusd-cygwin_nt-10.0-x86_64 differ
diff --git a/gitstatus/bin/gitstatusd-cygwin_nt-6.1-x86_64 b/gitstatus/bin/gitstatusd-cygwin_nt-6.1-x86_64
new file mode 120000
index 00000000..c0d9fb61
--- /dev/null
+++ b/gitstatus/bin/gitstatusd-cygwin_nt-6.1-x86_64
@@ -0,0 +1 @@
+gitstatusd-cygwin_nt-10.0-x86_64
\ No newline at end of file
diff --git a/gitstatus/gitstatus.plugin.zsh b/gitstatus/gitstatus.plugin.zsh
index edf3a105..e5bd86c4 100644
--- a/gitstatus/gitstatus.plugin.zsh
+++ b/gitstatus/gitstatus.plugin.zsh
@@ -287,18 +287,9 @@ function gitstatus_start() {
 
     req_fifo=$(mktemp -u "${TMPDIR:-/tmp}"/gitstatus.$$.pipe.req.XXXXXXXXXX)
     mkfifo $req_fifo
-    sysopen -rw -o cloexec,sync -u req_fd $req_fifo
-    command rm -f $req_fifo
 
     resp_fifo=$(mktemp -u "${TMPDIR:-/tmp}"/gitstatus.$$.pipe.resp.XXXXXXXXXX)
     mkfifo $resp_fifo
-    sysopen -rw -o cloexec -u resp_fd $resp_fifo
-    command rm -f $resp_fifo
-
-    function _gitstatus_process_response_${name}() {
-      _gitstatus_process_response ${${(%)${:-%N}}#_gitstatus_process_response_} 0 ''
-    }
-    zle -F $resp_fd _gitstatus_process_response_${name}
 
     [[ ${GITSTATUS_ENABLE_LOGGING:-0} == 1 ]] &&
       log_file=$(mktemp "${TMPDIR:-/tmp}"/gitstatus.$$.daemon-log.XXXXXXXXXX) ||
@@ -333,10 +324,19 @@ function gitstatus_start() {
         ${(q)daemon}-static $daemon_args
       fi
       echo -nE $'bye\x1f0\x1e'
-    " <&$req_fd >&$resp_fd 2>$log_file 3<$lock_file &!
+    " <$req_fifo >$resp_fifo 2>$log_file 3<$lock_file &!
 
     daemon_pid=$!
-    command rm -f $lock_file
+    
+    sysopen -w -o cloexec,sync -u req_fd $req_fifo
+    sysopen -r -o cloexec -u resp_fd $resp_fifo
+
+    command rm -f $req_fifo $resp_fifo $lock_file
+
+    function _gitstatus_process_response_${name}() {
+      _gitstatus_process_response ${${(%)${:-%N}}#_gitstatus_process_response_} 0 ''
+    }
+    zle -F $resp_fd _gitstatus_process_response_${name}
 
     local reply
     echo -nE $'hello\x1f\x1e' >&$req_fd