diff --git a/Get-the-fix-we-want.patch b/Get-the-fix-we-want.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f908fb919b326cab458669be1ce6f7ef9db0d4be
--- /dev/null
+++ b/Get-the-fix-we-want.patch
@@ -0,0 +1,434 @@
+From 59a4e934ee2ef01fd36c5673d87bfa3319f3e10e Mon Sep 17 00:00:00 2001
+From: Martin Hosken <martin_hosken@sil.org>
+Date: Fri, 7 Sep 2018 15:37:33 +0700
+Subject: [PATCH] Get the fix we want
+
+---
+ Lib/fontTools/feaLib/builder.py               |   2 +-
+ Tests/feaLib/builder_test.py                  |   2 +-
+ Tests/feaLib/data/bug1307.fea                 |  65 ++++++
+ Tests/feaLib/data/bug1307.ttx                 | 215 ++++++++++++++++++
+ Tests/feaLib/data/multiple_feature_blocks.ttx |   2 +-
+ Tests/feaLib/data/spec4h1.ttx                 |  12 +-
+ Tests/feaLib/data/spec4h2.ttx                 |  25 +-
+ 7 files changed, 308 insertions(+), 15 deletions(-)
+ create mode 100644 Tests/feaLib/data/bug1307.fea
+ create mode 100644 Tests/feaLib/data/bug1307.ttx
+
+diff --git a/Lib/fontTools/feaLib/builder.py b/Lib/fontTools/feaLib/builder.py
+index 28f03bded..f6fac1c07 100644
+--- a/Lib/fontTools/feaLib/builder.py
++++ b/Lib/fontTools/feaLib/builder.py
+@@ -706,7 +706,7 @@ class Builder(object):
+ 
+         key = (self.script_, language, self.cur_feature_name_)
+         lookups = self.features_.get((key[0], 'dflt', key[2]))
+-        if language != 'dflt' and include_default and lookups:
++        if (language == 'dflt' or include_default) and lookups:
+             self.features_[key] = lookups[:]
+         else:
+             self.features_[key] = []
+diff --git a/Tests/feaLib/builder_test.py b/Tests/feaLib/builder_test.py
+index 5108b7dc4..d72a9c936 100644
+--- a/Tests/feaLib/builder_test.py
++++ b/Tests/feaLib/builder_test.py
+@@ -65,7 +65,7 @@ class BuilderTest(unittest.TestCase):
+         spec9a spec9b spec9c1 spec9c2 spec9c3 spec9d spec9e spec9f spec9g
+         spec10
+         bug453 bug457 bug463 bug501 bug502 bug504 bug505 bug506 bug509
+-        bug512 bug514 bug568 bug633
++        bug512 bug514 bug568 bug633 bug1307
+         name size size2 multiple_feature_blocks omitted_GlyphClassDef
+         ZeroValue_SinglePos_horizontal ZeroValue_SinglePos_vertical
+         ZeroValue_PairPos_horizontal ZeroValue_PairPos_vertical
+diff --git a/Tests/feaLib/data/bug1307.fea b/Tests/feaLib/data/bug1307.fea
+new file mode 100644
+index 000000000..dbc4ae365
+--- /dev/null
++++ b/Tests/feaLib/data/bug1307.fea
+@@ -0,0 +1,65 @@
++# Test of features and languagesystems
++
++lookup a {
++    sub a by A;
++} a;
++
++lookup b {
++    sub b by B;
++} b;
++
++lookup c {
++    sub c by C;
++} c;
++
++lookup d {
++    sub d by D;
++} d;
++
++lookup e {
++    sub e by E;
++} e;
++
++lookup f {
++    sub f by F;
++} f;
++
++lookup g {
++    sub g by G;
++} g;
++
++lookup h {
++    sub h by H;
++} h;
++
++lookup i {
++    sub i by I;
++} i;
++
++languagesystem DFLT dflt;
++languagesystem DFLT FRE;
++languagesystem DFLT ABC;
++languagesystem latn dflt;
++languagesystem latn ABC;
++
++feature smcp {
++    lookup a;
++} smcp;
++
++feature liga {
++    lookup b;
++    script DFLT;
++        lookup c;
++        language dflt;
++            lookup d;
++        language FRE;
++            lookup e;
++    script latn;
++        lookup f;
++        language dflt;
++            lookup g;
++        language FRE;
++            lookup h;
++        language DEF exclude_dflt;
++            lookup i;
++} liga;
+diff --git a/Tests/feaLib/data/bug1307.ttx b/Tests/feaLib/data/bug1307.ttx
+new file mode 100644
+index 000000000..1ecbf03ff
+--- /dev/null
++++ b/Tests/feaLib/data/bug1307.ttx
+@@ -0,0 +1,215 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ttFont>
++
++  <GSUB>
++    <Version value="0x00010000"/>
++    <ScriptList>
++      <!-- ScriptCount=2 -->
++      <ScriptRecord index="0">
++        <ScriptTag value="DFLT"/>
++        <Script>
++          <DefaultLangSys>
++            <ReqFeatureIndex value="65535"/>
++            <!-- FeatureCount=2 -->
++            <FeatureIndex index="0" value="4"/>
++            <FeatureIndex index="1" value="6"/>
++          </DefaultLangSys>
++          <!-- LangSysCount=2 -->
++          <LangSysRecord index="0">
++            <LangSysTag value="ABC "/>
++            <LangSys>
++              <ReqFeatureIndex value="65535"/>
++              <!-- FeatureCount=2 -->
++              <FeatureIndex index="0" value="0"/>
++              <FeatureIndex index="1" value="6"/>
++            </LangSys>
++          </LangSysRecord>
++          <LangSysRecord index="1">
++            <LangSysTag value="FRE "/>
++            <LangSys>
++              <ReqFeatureIndex value="65535"/>
++              <!-- FeatureCount=2 -->
++              <FeatureIndex index="0" value="2"/>
++              <FeatureIndex index="1" value="6"/>
++            </LangSys>
++          </LangSysRecord>
++        </Script>
++      </ScriptRecord>
++      <ScriptRecord index="1">
++        <ScriptTag value="latn"/>
++        <Script>
++          <DefaultLangSys>
++            <ReqFeatureIndex value="65535"/>
++            <!-- FeatureCount=2 -->
++            <FeatureIndex index="0" value="5"/>
++            <FeatureIndex index="1" value="6"/>
++          </DefaultLangSys>
++          <!-- LangSysCount=3 -->
++          <LangSysRecord index="0">
++            <LangSysTag value="ABC "/>
++            <LangSys>
++              <ReqFeatureIndex value="65535"/>
++              <!-- FeatureCount=2 -->
++              <FeatureIndex index="0" value="0"/>
++              <FeatureIndex index="1" value="6"/>
++            </LangSys>
++          </LangSysRecord>
++          <LangSysRecord index="1">
++            <LangSysTag value="DEF "/>
++            <LangSys>
++              <ReqFeatureIndex value="65535"/>
++              <!-- FeatureCount=1 -->
++              <FeatureIndex index="0" value="1"/>
++            </LangSys>
++          </LangSysRecord>
++          <LangSysRecord index="2">
++            <LangSysTag value="FRE "/>
++            <LangSys>
++              <ReqFeatureIndex value="65535"/>
++              <!-- FeatureCount=1 -->
++              <FeatureIndex index="0" value="3"/>
++            </LangSys>
++          </LangSysRecord>
++        </Script>
++      </ScriptRecord>
++    </ScriptList>
++    <FeatureList>
++      <!-- FeatureCount=7 -->
++      <FeatureRecord index="0">
++        <FeatureTag value="liga"/>
++        <Feature>
++          <!-- LookupCount=1 -->
++          <LookupListIndex index="0" value="1"/>
++        </Feature>
++      </FeatureRecord>
++      <FeatureRecord index="1">
++        <FeatureTag value="liga"/>
++        <Feature>
++          <!-- LookupCount=1 -->
++          <LookupListIndex index="0" value="8"/>
++        </Feature>
++      </FeatureRecord>
++      <FeatureRecord index="2">
++        <FeatureTag value="liga"/>
++        <Feature>
++          <!-- LookupCount=4 -->
++          <LookupListIndex index="0" value="1"/>
++          <LookupListIndex index="1" value="2"/>
++          <LookupListIndex index="2" value="3"/>
++          <LookupListIndex index="3" value="4"/>
++        </Feature>
++      </FeatureRecord>
++      <FeatureRecord index="3">
++        <FeatureTag value="liga"/>
++        <Feature>
++          <!-- LookupCount=4 -->
++          <LookupListIndex index="0" value="1"/>
++          <LookupListIndex index="1" value="5"/>
++          <LookupListIndex index="2" value="6"/>
++          <LookupListIndex index="3" value="7"/>
++        </Feature>
++      </FeatureRecord>
++      <FeatureRecord index="4">
++        <FeatureTag value="liga"/>
++        <Feature>
++          <!-- LookupCount=3 -->
++          <LookupListIndex index="0" value="1"/>
++          <LookupListIndex index="1" value="2"/>
++          <LookupListIndex index="2" value="3"/>
++        </Feature>
++      </FeatureRecord>
++      <FeatureRecord index="5">
++        <FeatureTag value="liga"/>
++        <Feature>
++          <!-- LookupCount=3 -->
++          <LookupListIndex index="0" value="1"/>
++          <LookupListIndex index="1" value="5"/>
++          <LookupListIndex index="2" value="6"/>
++        </Feature>
++      </FeatureRecord>
++      <FeatureRecord index="6">
++        <FeatureTag value="smcp"/>
++        <Feature>
++          <!-- LookupCount=1 -->
++          <LookupListIndex index="0" value="0"/>
++        </Feature>
++      </FeatureRecord>
++    </FeatureList>
++    <LookupList>
++      <!-- LookupCount=9 -->
++      <Lookup index="0">
++        <LookupType value="1"/>
++        <LookupFlag value="0"/>
++        <!-- SubTableCount=1 -->
++        <SingleSubst index="0">
++          <Substitution in="a" out="A"/>
++        </SingleSubst>
++      </Lookup>
++      <Lookup index="1">
++        <LookupType value="1"/>
++        <LookupFlag value="0"/>
++        <!-- SubTableCount=1 -->
++        <SingleSubst index="0">
++          <Substitution in="b" out="B"/>
++        </SingleSubst>
++      </Lookup>
++      <Lookup index="2">
++        <LookupType value="1"/>
++        <LookupFlag value="0"/>
++        <!-- SubTableCount=1 -->
++        <SingleSubst index="0">
++          <Substitution in="c" out="C"/>
++        </SingleSubst>
++      </Lookup>
++      <Lookup index="3">
++        <LookupType value="1"/>
++        <LookupFlag value="0"/>
++        <!-- SubTableCount=1 -->
++        <SingleSubst index="0">
++          <Substitution in="d" out="D"/>
++        </SingleSubst>
++      </Lookup>
++      <Lookup index="4">
++        <LookupType value="1"/>
++        <LookupFlag value="0"/>
++        <!-- SubTableCount=1 -->
++        <SingleSubst index="0">
++          <Substitution in="e" out="E"/>
++        </SingleSubst>
++      </Lookup>
++      <Lookup index="5">
++        <LookupType value="1"/>
++        <LookupFlag value="0"/>
++        <!-- SubTableCount=1 -->
++        <SingleSubst index="0">
++          <Substitution in="f" out="F"/>
++        </SingleSubst>
++      </Lookup>
++      <Lookup index="6">
++        <LookupType value="1"/>
++        <LookupFlag value="0"/>
++        <!-- SubTableCount=1 -->
++        <SingleSubst index="0">
++          <Substitution in="g" out="G"/>
++        </SingleSubst>
++      </Lookup>
++      <Lookup index="7">
++        <LookupType value="1"/>
++        <LookupFlag value="0"/>
++        <!-- SubTableCount=1 -->
++        <SingleSubst index="0">
++          <Substitution in="h" out="H"/>
++        </SingleSubst>
++      </Lookup>
++      <Lookup index="8">
++        <LookupType value="1"/>
++        <LookupFlag value="0"/>
++        <!-- SubTableCount=1 -->
++        <SingleSubst index="0">
++          <Substitution in="i" out="I"/>
++        </SingleSubst>
++      </Lookup>
++    </LookupList>
++  </GSUB>
++
++</ttFont>
+diff --git a/Tests/feaLib/data/multiple_feature_blocks.ttx b/Tests/feaLib/data/multiple_feature_blocks.ttx
+index 73380c8ad..4f9a38960 100644
+--- a/Tests/feaLib/data/multiple_feature_blocks.ttx
++++ b/Tests/feaLib/data/multiple_feature_blocks.ttx
+@@ -22,7 +22,7 @@
+           <DefaultLangSys>
+             <ReqFeatureIndex value="65535"/>
+             <!-- FeatureCount=1 -->
+-            <FeatureIndex index="0" value="0"/>
++            <FeatureIndex index="0" value="1"/>
+           </DefaultLangSys>
+           <!-- LangSysCount=1 -->
+           <LangSysRecord index="0">
+diff --git a/Tests/feaLib/data/spec4h1.ttx b/Tests/feaLib/data/spec4h1.ttx
+index 4d3931cc9..0e42fc56e 100644
+--- a/Tests/feaLib/data/spec4h1.ttx
++++ b/Tests/feaLib/data/spec4h1.ttx
+@@ -65,16 +65,18 @@
+       <FeatureRecord index="0">
+         <FeatureTag value="liga"/>
+         <Feature>
+-          <!-- LookupCount=2 -->
+-          <LookupListIndex index="0" value="2"/>
+-          <LookupListIndex index="1" value="3"/>
++          <!-- LookupCount=3 -->
++          <LookupListIndex index="0" value="1"/>
++          <LookupListIndex index="1" value="2"/>
++          <LookupListIndex index="2" value="3"/>
+         </Feature>
+       </FeatureRecord>
+       <FeatureRecord index="1">
+         <FeatureTag value="liga"/>
+         <Feature>
+-          <!-- LookupCount=1 -->
+-          <LookupListIndex index="0" value="2"/>
++          <!-- LookupCount=2 -->
++          <LookupListIndex index="0" value="1"/>
++          <LookupListIndex index="1" value="2"/>
+         </Feature>
+       </FeatureRecord>
+       <FeatureRecord index="2">
+diff --git a/Tests/feaLib/data/spec4h2.ttx b/Tests/feaLib/data/spec4h2.ttx
+index 8005c2f69..266c4870d 100644
+--- a/Tests/feaLib/data/spec4h2.ttx
++++ b/Tests/feaLib/data/spec4h2.ttx
+@@ -19,6 +19,11 @@
+       <ScriptRecord index="1">
+         <ScriptTag value="cyrl"/>
+         <Script>
++          <DefaultLangSys>
++            <ReqFeatureIndex value="65535"/>
++            <!-- FeatureCount=1 -->
++            <FeatureIndex index="0" value="3"/>
++          </DefaultLangSys>
+           <!-- LangSysCount=1 -->
+           <LangSysRecord index="0">
+             <LangSysTag value="SRB "/>
+@@ -74,16 +79,20 @@
+       <FeatureRecord index="0">
+         <FeatureTag value="liga"/>
+         <Feature>
+-          <!-- LookupCount=2 -->
+-          <LookupListIndex index="0" value="2"/>
+-          <LookupListIndex index="1" value="3"/>
++          <!-- LookupCount=4 -->
++          <LookupListIndex index="0" value="0"/>
++          <LookupListIndex index="1" value="1"/>
++          <LookupListIndex index="2" value="2"/>
++          <LookupListIndex index="3" value="3"/>
+         </Feature>
+       </FeatureRecord>
+       <FeatureRecord index="1">
+         <FeatureTag value="liga"/>
+         <Feature>
+-          <!-- LookupCount=1 -->
+-          <LookupListIndex index="0" value="4"/>
++          <!-- LookupCount=3 -->
++          <LookupListIndex index="0" value="0"/>
++          <LookupListIndex index="1" value="1"/>
++          <LookupListIndex index="2" value="4"/>
+         </Feature>
+       </FeatureRecord>
+       <FeatureRecord index="2">
+@@ -104,8 +113,10 @@
+       <FeatureRecord index="4">
+         <FeatureTag value="liga"/>
+         <Feature>
+-          <!-- LookupCount=1 -->
+-          <LookupListIndex index="0" value="2"/>
++          <!-- LookupCount=3 -->
++          <LookupListIndex index="0" value="0"/>
++          <LookupListIndex index="1" value="1"/>
++          <LookupListIndex index="2" value="2"/>
+         </Feature>
+       </FeatureRecord>
+     </FeatureList>
+-- 
+2.39.0.windows.2
+
diff --git a/fonttools.spec b/fonttools.spec
index 6a2ad99510d010830e71c6c3669987eb0f90fe1f..4b0b00f37bb72e2091a94268f59633467c41b6c5 100644
--- a/fonttools.spec
+++ b/fonttools.spec
@@ -1,6 +1,6 @@
 Name:           fonttools
 Version:        3.29.0
-Release:        6
+Release:        7
 Summary:        Tools to manipulate font files
 License:        MIT
 URL:            https://github.com/fonttools/fonttools/
@@ -8,6 +8,7 @@ Source0:        %{url}/releases/download/%{version}/fonttools-%{version}.zip
 Patch01:	replace-fromtring-with-frombytes.patch
 Patch02:	replace-totring-with-tobytes.patch
 Patch03:        fix-test.patch
+Patch04:        Get-the-fix-we-want.patch
 
 Requires:       python3-fonttools
 BuildArch:      noarch
@@ -66,8 +67,12 @@ rm -rf *.egg-info
 %{python3_sitelib}/fonttools-%{version}-py3.?.egg-info
 
 %changelog
+* Mon Jan 16 2023 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 3.29.0-7
+- Get the fix we want
+
 * Mon Jan 9 2023 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 3.29.0-6 
 - fix test
+
 * Tue Jan 11 2022 houyingchao <houyingchao@huawei.com> - 3.29.0-5
 - Replace totring with tobytes