diff --git a/windows/JackWinNamedPipe.cpp b/windows/JackWinNamedPipe.cpp
index 81569da5..c0279479 100644
--- a/windows/JackWinNamedPipe.cpp
+++ b/windows/JackWinNamedPipe.cpp
@@ -31,11 +31,11 @@ int JackWinNamedPipe::Read(void* data, int len)
 {
     DWORD read;
     BOOL res = ReadFile(fNamedPipe, data, len, &read, NULL);
-    if (read != (DWORD)len) {
+    if (res && read == (DWORD)len) {
+        return 0;
+    } else {
         jack_error("Cannot read named pipe err = %ld", GetLastError());
         return -1;
-    } else {
-        return 0;
     }
 }
 
@@ -43,11 +43,11 @@ int JackWinNamedPipe::Write(void* data, int len)
 {
     DWORD written;
     BOOL res = WriteFile(fNamedPipe, data, len, &written, NULL);
-    if (written != (DWORD)len) {
+    if (res && written == (DWORD)len) {
+        return 0;
+    } else {
         jack_error("Cannot write named pipe err = %ld", GetLastError());
         return -1;
-    } else {
-        return 0;
     }
 }
 
@@ -113,7 +113,7 @@ void JackWinNamedPipeClient::SetWriteTimeOut(long sec)
 {}
 
 JackWinAsyncNamedPipeClient::JackWinAsyncNamedPipeClient()
-        : JackWinNamedPipeClient(), fIOState(kIdle), fPendingIO(false)
+        : JackWinNamedPipeClient(), fPendingIO(false), fIOState(kIdle)
 {
     fIOState = kIdle;
     fOverlap.hEvent = CreateEvent(NULL,     // default security attribute
@@ -123,7 +123,7 @@ JackWinAsyncNamedPipeClient::JackWinAsyncNamedPipeClient()
 }
 
 JackWinAsyncNamedPipeClient::JackWinAsyncNamedPipeClient(HANDLE pipe, bool pending)
-        : JackWinNamedPipeClient(pipe), fIOState(kIdle), fPendingIO(pending)
+        : JackWinNamedPipeClient(pipe), fPendingIO(pending), fIOState(kIdle)
 {
     fOverlap.hEvent = CreateEvent(NULL,     // default security attribute
                                   TRUE,     // manual-reset event
@@ -174,6 +174,9 @@ int JackWinAsyncNamedPipeClient::FinishIO()
             }
             fIOState = kReading;
             break;
+
+        default:
+            break;
     }
 
     return 0;
diff --git a/windows/Setup/jack.ci b/windows/Setup/jack.ci
index a222f063..dd401d7a 100644
--- a/windows/Setup/jack.ci
+++ b/windows/Setup/jack.ci
@@ -1,9 +1,9 @@
 <*project
       version = 4 civer = "Free v4.14.3" winver = "2.6/5.1.2600" > 
    <output> .</>
-   <exename> Jack_v1.90_setup.exe</>
+   <exename> Jack_v1.9.1_setup.exe</>
    <digitsign> </>
-   <appname> Jack v1.90</>
+   <appname> Jack v1.9.1</>
    <password> </>
    <addlang> </>
    <icon> Default - 2</>