Index: Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj
===================================================================
diff -u -r407bf9a62e9575d7b3b32470bde7ebf0c5262447 -re9cfd0fb487437584a6e42cfbacafcf48e15c7f6
--- Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj	(.../Application.Riskeer.Setup.wixproj)	(revision 407bf9a62e9575d7b3b32470bde7ebf0c5262447)
+++ Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj	(.../Application.Riskeer.Setup.wixproj)	(revision e9cfd0fb487437584a6e42cfbacafcf48e15c7f6)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -17,8 +17,6 @@
 	-->
     <OutputName>Riskeer Setup ($(ReleaseVersion))</OutputName>
     <OutputType>Package</OutputType>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <Name>RiskeerSetup</Name>
     <RunWixToolsOutOfProc>true</RunWixToolsOutOfProc>
     <OutputPath>bin\$(Configuration)\</OutputPath>
@@ -326,7 +324,8 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(WixTargetsPath)" />
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);ReleaseVersion=$(ReleaseVersion);ApplicationBinFolder=..\..\..\..\bin\$(Configuration);InstallerLicensesFolder=licenses\;ExamplesFolder=Examples\;</DefineConstants>
   </PropertyGroup>