diff --git a/buildwin.cmd b/buildwin.cmd
index ee416802e..2129d59bc 100644
--- a/buildwin.cmd
+++ b/buildwin.cmd
@@ -38,12 +38,12 @@ if "%1"=="" goto usage
 
 rem -version ^^[16.0^^,17.0^^)
 set VS_VERSION=vs%1
-if %VS_VERSION%==vs160 (
 rem  should be set "VSWHERE='%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe  -property installationPath -version ^[16.0^,17.0^)'"
-  set "VSWHERE='C:\PROGRA~2\MICROS~1\Installer\vswhere.exe  -latest -property installationPath -version ^[16.0^,17.0^)'"
+if %VS_VERSION%==vs160 (
+  set "VSWHERE='C:\PROGRA~2\"Microsoft Visual Studio"\Installer\vswhere.exe  -latest -property installationPath -version ^[16.0^,17.0^)'"
 ) else (
 if %VS_VERSION%==vs150 (
-  set "VSWHERE='C:\PROGRA~2\MICROS~1\Installer\vswhere.exe  -latest -property installationPath -version ^[15.0^,16.0^)'"
+  set "VSWHERE='C:\PROGRA~2\"Microsoft Visual Studio"\Installer\vswhere.exe  -latest -property installationPath -version ^[15.0^,16.0^)'"
 )
 )
 for /f " delims=" %%a in (%VSWHERE%) do @set "VSCOMNTOOLS=%%a"