diff --git a/lib/Find-VS2017.cs b/lib/Find-VS2017.cs
index 1d2c9b0d54..87e0a9c9bb 100644
--- a/lib/Find-VS2017.cs
+++ b/lib/Find-VS2017.cs
@@ -230,7 +230,7 @@ private static bool CheckInstance(ISetupInstance2 setupInstance2, ref StringBuil
                     hasVCTools = true;
                 else if (id.StartsWith(Win10SDKPrefix)) {
                     string[] parts = id.Substring(Win10SDKPrefix.Length).Split('.');
-                    if (parts.Length == 2 && parts[1] != "Desktop")
+                    if (parts.Length > 1 && parts[1] != "Desktop")
                         continue;
                     Win10SDKVer = Math.Max(Win10SDKVer, UInt32.Parse(parts[0]));
                 } else if (id == "Microsoft.VisualStudio.Component.Windows81SDK")