diff --git a/NotoColorEmoji.tmpl.ttx.tmpl b/NotoColorEmoji.tmpl.ttx.tmpl
index b4585df19..6811f5c34 100644
--- a/NotoColorEmoji.tmpl.ttx.tmpl
+++ b/NotoColorEmoji.tmpl.ttx.tmpl
@@ -443,6 +443,7 @@
           </Coverage>
           <BacktrackClassDef Format="1">
             <ClassDef glyph="u1F3F4" class="1"/>
+            <ClassDef glyph="uE007F" class="1"/>
           </BacktrackClassDef>
           <InputClassDef Format="2">
             <ClassDef glyph="uE0030" class="2"/>
@@ -510,6 +511,9 @@
           <LigatureSet glyph="u1F3F4">
             <Ligature components="uE007F" glyph="uFE82B"/>
           </LigatureSet>
+          <LigatureSet glyph="uE007F">
+            <Ligature components="u1F3F4" glyph="uFE82B"/>
+          </LigatureSet>
         </LigatureSubst>
       </Lookup>
     </LookupList>
diff --git a/third_party/color_emoji/add_glyphs.py b/third_party/color_emoji/add_glyphs.py
index f5f29080c..aba1facf8 100644
--- a/third_party/color_emoji/add_glyphs.py
+++ b/third_party/color_emoji/add_glyphs.py
@@ -178,7 +178,7 @@ def add_lig_sequence(ligatures, seq, n):
                 print 'lig sequence %s, replace %s with %s' % (
                     tseq, ligatures[tseq], n)
         ligatures[tseq] = n
-        if 'u200D' in seq:
+        if 'u200D' in seq or 'uE007F' in seq:
                 rev_seq = seq[:]
                 rev_seq.reverse()
                 for i in xrange(1, len(rev_seq)):