diff --git a/src/engine/vswhere_usability_wrapper.cmd b/src/engine/vswhere_usability_wrapper.cmd
index d642a578e..bc5c60528 100644
--- a/src/engine/vswhere_usability_wrapper.cmd
+++ b/src/engine/vswhere_usability_wrapper.cmd
@@ -1,3 +1,4 @@
+:: Copyright 2020 - Rene Ferdinand Rivera Morell
 :: Copyright 2017 - Refael Ackermann
 :: Copyright 2019 - Thomas Kent
 :: Distributed under MIT style license
@@ -16,15 +17,16 @@ if errorlevel 1 goto :no-vswhere
 set VSWHERE_REQ=-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64
 set VSWHERE_PRP=-property installationPath
 
-REM Visual Studio 2017 (15.X, toolset 14.1)
-set VSWHERE_LMT=-version "[15.0,16.0)"
-SET VSWHERE_ARGS=-latest -products * %VSWHERE_REQ% %VSWHERE_PRP% %VSWHERE_LMT%
+REM Visual Studio Unknown Version, Beyond 2019
+set VSWHERE_LMT=-version "[17.0,18.0)"
+set VSWHERE_PRERELEASE=-prerelease
+SET VSWHERE_ARGS=-latest -products * %VSWHERE_REQ% %VSWHERE_PRP% %VSWHERE_LMT% %VSWHERE_PRERELEASE%
 for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (
     endlocal
 	echo Found with vswhere %%i
     @rem comment out setting VCINSTALLDIR for Boost.build
     @rem set "VCINSTALLDIR=%%i\VC\"
-    set "VS150COMNTOOLS=%%i\Common7\Tools\"
+    set "VSUNKCOMNTOOLS=%%i\Common7\Tools\"
     exit /B 0
 )
 
@@ -40,16 +42,15 @@ for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (
     exit /B 0
 )
 
-REM Visual Studio Unknown Version, Beyond 2019
-set VSWHERE_LMT=-version "[17.0)"
-set VSWHERE_PRERELEASE=-prerelease
-SET VSWHERE_ARGS=-latest -products * %VSWHERE_REQ% %VSWHERE_PRP% %VSWHERE_LMT% %VSWHERE_PRERELEASE%
+REM Visual Studio 2017 (15.X, toolset 14.1)
+set VSWHERE_LMT=-version "[15.0,16.0)"
+SET VSWHERE_ARGS=-latest -products * %VSWHERE_REQ% %VSWHERE_PRP% %VSWHERE_LMT%
 for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (
     endlocal
 	echo Found with vswhere %%i
     @rem comment out setting VCINSTALLDIR for Boost.build
     @rem set "VCINSTALLDIR=%%i\VC\"
-    set "VSUNKCOMNTOOLS=%%i\Common7\Tools\"
+    set "VS150COMNTOOLS=%%i\Common7\Tools\"
     exit /B 0
 )