diff --git a/build/win_helper.py b/build/win_helper.py
index be977c8..dd5d06d 100644
--- a/build/win_helper.py
+++ b/build/win_helper.py
@@ -186,7 +186,12 @@ class WinTool(object):
           'Microsoft Visual Studio', 'Installer', 'vswhere.exe')
       if os.path.exists(vswhere_path):
         installation_path = subprocess.check_output(
-            [vswhere_path, '-latest', '-property', 'installationPath']).strip()
+            [vswhere_path, '-latest', '-products',
+             'Microsoft.VisualStudio.Product.Enterprise',
+             'Microsoft.VisualStudio.Product.Professional',
+             'Microsoft.VisualStudio.Product.Community',
+             'Microsoft.VisualStudio.Product.BuildTools',
+             '-property', 'installationPath']).strip()
         if installation_path:
           return (installation_path.decode("utf-8"),
                   os.path.join('VC', 'Auxiliary', 'Build', 'vcvarsall.bat'))
