diff --git a/Tools/find_vstool.ps1 b/Tools/find_vstool.ps1
index bc6d13333..95ab47fd2 100644
--- a/Tools/find_vstool.ps1
+++ b/Tools/find_vstool.ps1
@@ -24,7 +24,7 @@ function EditBinCertificateIsValid() {
     )
     $file_signature = Get-AuthenticodeSignature -FilePath $Path
     if (($file_signature.Status -ne "Valid") -or ($valid_microsoft_cert_thumbprints -notcontains $file_signature.SignerCertificate.Thumbprint)) {
-        Write-Warning "Could not validate the signature of $Path"
+        Write-Warning "Could not validate the signature of $Path $($file_signature.SignerCertificate.Thumbprint)"
         Write-Output "file_signature.SignerCertificate.Thumbprint: $($file_signature.SignerCertificate.Thumbprint)"
         return $false
     } else {
@@ -32,7 +32,6 @@ function EditBinCertificateIsValid() {
     }
 }
 
-
 function ToolCanBeExecuted {
     param (
         [string]
@@ -41,6 +40,7 @@ function ToolCanBeExecuted {
     $env:PATHEXT.Contains((Get-Item $Path).Extension.ToUpper())
 }
 
+
 $rootSearchPaths = @(
     [System.IO.Directory]::EnumerateFileSystemEntries("C:\Program Files", "*Visual Studio*", [System.IO.SearchOption]::TopDirectoryOnly),
     [System.IO.Directory]::EnumerateFileSystemEntries("C:\Program Files (x86)", "*Visual Studio*", [System.IO.SearchOption]::TopDirectoryOnly)
@@ -52,7 +52,8 @@ foreach ($searchPath in $rootSearchPaths) {
         Write-Verbose "Searching in folder '$visualStudioFolder'"
         $matchingExes = [System.IO.Directory]::EnumerateFileSystemEntries($visualStudioFolder, $FileName, [System.IO.SearchOption]::AllDirectories)
         foreach ($matchingExe in $matchingExes) {
-            if ((EditBinCertificateIsValid -Path $matchingExe) -and (ToolCanBeExecuted -Path $matchingExe)) {
+            #if ((EditBinCertificateIsValid -Path $matchingExe) -and (ToolCanBeExecuted -Path $matchingExe)) {
+            if (ToolCanBeExecuted -Path $matchingExe) {
                 return $matchingExe
             }
         }