diff --git a/bin/phpsdk_setshell.bat b/bin/phpsdk_setshell.bat
index 50c4534..775de8d 100644
--- a/bin/phpsdk_setshell.bat
+++ b/bin/phpsdk_setshell.bat
@@ -80,11 +80,15 @@ if 15 gtr %PHP_SDK_VC_NUM% (
 	rem vc15 support only for now, could parse out and pass on later
 	for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC
 	if not exist "!PHP_SDK_VC_DIR!" (
-            for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC
-            if not exist "!PHP_SDK_VC_DIR!" (
-		echo Could not determine '%PHP_SDK_VC%' directory
-		goto out_error;
-            )
+		for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC
+		if not exist "!PHP_SDK_VC_DIR!" (
+			rem check for a preview release
+			for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo -version %PHP_SDK_VC_NUM% -prerelease -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -format text') do set PHP_SDK_VC_DIR=%%b\VC
+			if not exist "!PHP_SDK_VC_DIR!" (
+				echo Could not determine '%PHP_SDK_VC%' directory
+				goto out_error;
+			)
+		)
 	)
 	set VSCMD_ARG_no_logo=nologo
 )