diff --git a/wix/Main.wxs.template b/wix/Main.wxs.template
index 1da6bf8d0..8bfd1ab01 100644
--- a/wix/Main.wxs.template
+++ b/wix/Main.wxs.template
@@ -135,9 +135,12 @@
 
         <RegistryValue Root="HKMU" Key="SOFTWARE\Classes\{vendor}.jarfile\shell\open\command" Type="string" Value="&quot;[INSTALLDIR]bin\javaw.exe&quot; -jar &quot;%1&quot; %*" KeyPath="no" />
       </Component>
+      <Component Id="SetOracleJavaSoftKeysCurrentVersion" Guid="*">
+        <Condition><![CDATA[JAVASOFT_CURRENTVERSION <> "1.8" AND JAVASOFT_CURRENTVERSION > $(var.ProductMajorVersion)]]></Condition>
+          <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]" Name="CurrentVersion" Type="string" Value="[ORACLE_VERSION_KEY]" KeyPath="yes" />
+      </Component>
       <Component Id="SetOracleJavaSoftKeys" Guid="*">
-        <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]" Name="CurrentVersion" Type="string" Value="[ORACLE_VERSION_KEY]" KeyPath="yes" />
-        <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]\[ORACLE_VERSION_KEY]" Name="JavaHome" Type="string" Value="[INSTALLDIR]" KeyPath="no" />
+        <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]\[ORACLE_VERSION_KEY]" Name="JavaHome" Type="string" Value="[INSTALLDIR]" KeyPath="yes" />
         <?if $(env.PRODUCT_CATEGORY)="jre"?>
             <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]\[ORACLE_VERSION_KEY]" Name="RuntimeLib" Type="string" Value="[INSTALLDIR][DLL_PATH]" KeyPath="no" />
             <!-- Oracle dont set RuntimeLib for JDK .. because JRE is "private" JRE so no ?else? -->
@@ -202,7 +205,7 @@
         <!-- As Oracle, don't override if current value is already bigger ( newer java ): "a value that is the highest installed version on the system" 
         Note !! : the reg key is not removed during uninstall if any other installer reference it
         -->
-        <Condition Level="0"><![CDATA[JAVASOFT_CURRENTVERSION <> "1.8" AND JAVASOFT_CURRENTVERSION > $(var.ProductMajorVersion)]]></Condition>
+        <ComponentRef Id="SetOracleJavaSoftKeysCurrentVersion" />
         <ComponentRef Id="SetOracleJavaSoftKeys" />
       </Feature>
       <?if $(env.Platform)=x64?>