diff --git a/scripts/win_wrapper.cmd b/scripts/win_wrapper.cmd
index 74f7159..e85ccc7 100644
--- a/scripts/win_wrapper.cmd
+++ b/scripts/win_wrapper.cmd
@@ -26,36 +26,31 @@ SET WIN_WDK=c:\Program Files (x86)\Windows Kits\10\Include\wdf
 SET MAJOR_PYTHON_VERSION=%PYTHON_VERSION:~0,1%
 SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2%
 
-:: Based on the Python version, determine what SDK version to use, and whether
-:: to set the SDK for 64-bit.
+SET NO_SET_SDK_64=N
 IF %MAJOR_PYTHON_VERSION% == 2 (
     SET WINDOWS_SDK_VERSION="v7.0"
-    SET SET_SDK_64=Y
-)
-IF %MAJOR_PYTHON_VERSION% == 3 (
+) ELSE IF %MAJOR_PYTHON_VERSION% == 3 (
     SET WINDOWS_SDK_VERSION="v7.1"
-    IF %MINOR_PYTHON_VERSION% LEQ 4 (
+    IF %MINOR_PYTHON_VERSION% GEQ 5 (
         SET SET_SDK_64=Y
-    ) ELSE (
-        SET SET_SDK_64=N
     )
+) ELSE (
+    ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
+    EXIT 1
 )
 
-ECHO "Python: %MAJOR_PYTHON_VERSION%, %MINOR_PYTHON_VERSION%"
-ECHO "SDK %WINDOWS_SDK_VERSION%, 64? %SET_SDK_64%"
-
-IF %PYTHON_ARCH% == 64 (
-    IF %SET_SDK_64% == Y (
-        SET DISTUTILS_USE_SDK=1
-        SET MSSdk=1
-        "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
-        "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
-    ) ELSE (
-        IF EXIST "%WIN_WDK%" (
-            :: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/
-            REN "%WIN_WDK%" 0wdf
-        )
+IF "%NO_SET_SDK_64%"=="Y" (
+    IF EXIST "%WIN_WDK%" (
+        :: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/
+        REN "%WIN_WDK%" 0wdf
     )
+   call %COMMAND_TO_RUN% || EXIT 1
+) ELSE IF "%PYTHON_ARCH%"=="64" (
+    SET DISTUTILS_USE_SDK=1
+    SET MSSdk=1
+    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
+    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
+    call %COMMAND_TO_RUN% || EXIT 1
+) ELSE (
+    call %COMMAND_TO_RUN% || EXIT 1
 )
-
-call %COMMAND_TO_RUN% || EXIT 1