diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 3a8d5e2..f96ab68 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -71,6 +71,8 @@ else
 		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
 		comment "Start setup program"
 		ChangeDirectory "%SCRIPTPATH%"
+		Winbatch_extract_32
+		Sub_check_exitcode
 		Winbatch_install_32
 		Sub_check_exitcode
 		comment "Copy files"
@@ -85,6 +87,8 @@ else
 		Message "Installing " + $ProductId$ + " " + $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
 		comment "Start setup program"
 		ChangeDirectory "%SCRIPTPATH%"
+		Winbatch_extract_64
+		Sub_check_exitcode
 		Winbatch_install_64
 		Sub_check_exitcode
 		comment "Copy files"
diff --git a/builder-product.cfg b/builder-product.cfg
index 89ed37d..4b6bbaf 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -37,6 +37,12 @@ WINST_VALUE[0]="3C97621"
 WINST_NAME[1]="Extract64Dir"
 WINST_VALUE[1]="6BA2265"
 
+WINST_NAME[2]="TccLe32Dir"
+WINST_VALUE[2]="6BA2265"
+
+WINST_NAME[3]="TccLe64Dir"
+WINST_VALUE[3]="6BA2265"
+
 OPSI_INI_SECTION[0]="X86"
 OPSI_INI_OPTION[0]="MsiId32"
 OPSI_INI_VALUE[0]="{CF67BC8F-42C3-40E7-A2E1-DD87A3C97621}"