diff --git a/TGServiceInstaller/TGServiceInstaller.wixproj b/TGServiceInstaller/TGServiceInstaller.wixproj
index f0cf2730ea..be4c44e20c 100644
--- a/TGServiceInstaller/TGServiceInstaller.wixproj
+++ b/TGServiceInstaller/TGServiceInstaller.wixproj
@@ -69,10 +69,13 @@
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
     <Error Text="The WiX Toolset v3 build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
-  </Target>
-  <Target Name="AfterResolveReferences">
-    <Exec Command="powershell -Command &quot;$(SolutionDir)Tools/SignBasics.ps1&quot;" />
-  </Target>
+  </Target>
+  <Target Name="AfterResolveReferences">
+    <Exec Command="$(PreBuildEventCommand)" />
+  </Target>
+  <PropertyGroup>
+    <PreBuildEventCommand>powershell -Command "&amp; \"$(SolutionDir)Tools/SignMSI.ps1\""</PreBuildEventCommand>
+  </PropertyGroup>
   <PropertyGroup>
     <PostBuildEvent>powershell -Command "$(SolutionDir)Tools/SignMSI.ps1"</PostBuildEvent>
   </PropertyGroup>