diff --git a/src/main/c/Windows/SerialPort_Windows.c b/src/main/c/Windows/SerialPort_Windows.c
index 05e5473..83cf125 100644
--- a/src/main/c/Windows/SerialPort_Windows.c
+++ b/src/main/c/Windows/SerialPort_Windows.c
@@ -2,7 +2,7 @@
  * SerialPort_Windows.c
  *
  *       Created on:  Feb 25, 2012
- *  Last Updated on:  Jul 27, 2018
+ *  Last Updated on:  Sep 25, 2018
  *           Author:  Will Hedgecock
  *
  * Copyright (C) 2012-2018 Fazecast, Inc.
@@ -477,7 +477,7 @@ JNIEXPORT jboolean JNICALL Java_com_fazecast_jSerialComm_SerialPort_configTimeou
 		case (com_fazecast_jSerialComm_SerialPort_TIMEOUT_READ_SEMI_BLOCKING | com_fazecast_jSerialComm_SerialPort_TIMEOUT_WRITE_BLOCKING):		// Read Semi-blocking/Write Blocking
 			timeouts.ReadIntervalTimeout = MAXDWORD;
 			timeouts.ReadTotalTimeoutMultiplier = MAXDWORD;
-			timeouts.ReadTotalTimeoutConstant = readTimeout;
+			timeouts.ReadTotalTimeoutConstant = readTimeout ? readTimeout : 0x0FFFFFFF;
 			timeouts.WriteTotalTimeoutConstant = writeTimeout;
 			break;
 		case com_fazecast_jSerialComm_SerialPort_TIMEOUT_READ_BLOCKING:		// Read Blocking
diff --git a/src/main/resources/Windows/x86/jSerialComm.dll b/src/main/resources/Windows/x86/jSerialComm.dll
index 6b25ac3..6da66a7 100644
Binary files a/src/main/resources/Windows/x86/jSerialComm.dll and b/src/main/resources/Windows/x86/jSerialComm.dll differ
diff --git a/src/main/resources/Windows/x86/jSerialComm.exp b/src/main/resources/Windows/x86/jSerialComm.exp
index 3ca8d9e..93e111a 100644
Binary files a/src/main/resources/Windows/x86/jSerialComm.exp and b/src/main/resources/Windows/x86/jSerialComm.exp differ
diff --git a/src/main/resources/Windows/x86_64/jSerialComm.dll b/src/main/resources/Windows/x86_64/jSerialComm.dll
index bef73d7..84be263 100644
Binary files a/src/main/resources/Windows/x86_64/jSerialComm.dll and b/src/main/resources/Windows/x86_64/jSerialComm.dll differ
diff --git a/src/main/resources/Windows/x86_64/jSerialComm.exp b/src/main/resources/Windows/x86_64/jSerialComm.exp
index 75d92a3..4b99f12 100644
Binary files a/src/main/resources/Windows/x86_64/jSerialComm.exp and b/src/main/resources/Windows/x86_64/jSerialComm.exp differ