diff --git a/data/dictionary/TSCharacters.txt b/data/dictionary/TSCharacters.txt
index b33ec6acd..08f378dca 100644
--- a/data/dictionary/TSCharacters.txt
+++ b/data/dictionary/TSCharacters.txt
@@ -634,7 +634,7 @@
 團	团
 # @tofu-risk: not covered by PingFang/Source Han baseline: 𪢮 U+2A8AE
 圞	圞 𪢮
-坏	坯
+坏	坏 坯
 垻	坝
 埡	垭
 埨	𫭢
diff --git a/data/dictionary/TSPhrases.txt b/data/dictionary/TSPhrases.txt
index fc472fc31..1de74ec18 100644
--- a/data/dictionary/TSPhrases.txt
+++ b/data/dictionary/TSPhrases.txt
@@ -367,6 +367,7 @@
 袁祕	袁祕
 袖裏乾坤	袖里乾坤
 袷袢	袷袢
+製坏	制坯
 覆上	复上
 覆住	复住
 覆信	复信
@@ -473,6 +474,7 @@
 馮甦	冯甦
 魏徵	魏徵 魏征
 魚沈雁杳	鱼沉雁杳
+麪坏兒	面坯儿
 麼些族	麽些族
 黃甦	黄甦
 黃鍾公	黄锺公
diff --git a/test/testcases/testcases.json b/test/testcases/testcases.json
index 70ee32fae..934a46f7f 100755
--- a/test/testcases/testcases.json
+++ b/test/testcases/testcases.json
@@ -1598,6 +1598,13 @@
         "tw2sp": "乾闼婆"
       }
     },
+    {
+      "id": "t2s_huai_and_pi_phrases",
+      "input": "破坏 身坏命终 一坏 製坏 坏布 麪坏兒",
+      "expected": {
+        "t2s": "破坏 身坏命终 一坯 制坯 坯布 面坯儿"
+      }
+    },
     {
       "id": "BYVoid_OpenCC_Issue_941_chan_s2t",
       "input": "铲子 铲刀 铲车 铲土 铲土机 铲雪 铲雪车 铲冰 铲球 飞铲 踢铲 铲倒 铲射 铲抢 反铲 铲板 铲起 铲除",