diff --git a/windows/src/buildtools/devtools/DevInstallPackages.pas b/windows/src/buildtools/devtools/DevInstallPackages.pas
index 8ab1eb9e2b..1850c7e997 100644
--- a/windows/src/buildtools/devtools/DevInstallPackages.pas
+++ b/windows/src/buildtools/devtools/DevInstallPackages.pas
@@ -198,7 +198,7 @@ begin
         GetValueNames(FValues);
         for I := 0 to FValues.Count - 1 do
         begin
-          if SameText(Copy(FValues[I], 1, 11), CSourceRootLibPath+'\') then
+          if SameText(Copy(FValues[I], 1, Length(CSourceRootLibPath)+1), CSourceRootLibPath+'\') then
             DeleteValue(FValues[I]);
         end;
       finally
@@ -212,7 +212,7 @@ begin
       try
         GetValueNames(FValues);
         for I := 0 to FValues.Count - 1 do
-          if SameText(Copy(FValues[I], 1, 11), CSourceRootLibPath+'\') then
+          if SameText(Copy(FValues[I], 1, Length(CSourceRootLibPath)+1), CSourceRootLibPath+'\') then
             DeleteValue(FValues[I]);
       finally
         FValues.Free;
diff --git a/windows/src/buildtools/devtools/devtools.bin b/windows/src/buildtools/devtools/devtools.bin
index 2b46b39231..1631aee182 100644
Binary files a/windows/src/buildtools/devtools/devtools.bin and b/windows/src/buildtools/devtools/devtools.bin differ