diff --git a/app/languages/definitions/ChineseBopomofo.hidden b/app/languages/definitions/ChineseBopomofo.hidden
index 8eb268cc..f746c4bb 100644
--- a/app/languages/definitions/ChineseBopomofo.hidden
+++ b/app/languages/definitions/ChineseBopomofo.hidden
@@ -6,7 +6,7 @@ hasSpaceBetweenWords: no
 hasUpperCase: no
 layout:
   - [ㄧ, ㄨ, ㄩ, SPECIAL] # 0
-  - [ㄅ, ㄆ, ㄇ, ㄈ, PUNCTUATION_ZH] # 1
+  - [ㄅ, ㄆ, ㄇ, ㄈ, PUNCTUATION_BP] # 1
   - [ㄉ, ㄊ, ㄋ, ㄌ] # 2
   - [ㄍ, ㄎ, ㄏ] # 3
   - [ㄐ, ㄑ, ㄒ] # 4
diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeBopomofo.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeBopomofo.java
index 6e6cd77a..179c8c97 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeBopomofo.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModeBopomofo.java
@@ -52,7 +52,7 @@ public class ModeBopomofo extends ModePinyin {
 
 		// punctuation
 		KEY_CHARACTERS.add(
-			TextTools.removeLettersFromList(applyPunctuationOrder(Characters.PunctuationChinese, 1))
+			TextTools.removeLettersFromList(applyPunctuationOrder(Characters.PunctuationChineseBopomofo, 1))
 		);
 	}
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java b/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java
index 560d554b..8730b45b 100644
--- a/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java
+++ b/app/src/main/java/io/github/sspanak/tt9/languages/NaturalLanguage.java
@@ -87,6 +87,7 @@ public class NaturalLanguage extends TranscribedLanguage {
 		specialChars.put(SPECIAL_CHARS_PLACEHOLDER, Characters.getSpecial(this));
 		specialChars.put(PUNCTUATION_PLACEHOLDER, Characters.PunctuationEnglish);
 		specialChars.put(PUNCTUATION_PLACEHOLDER + "_AR", Characters.PunctuationArabic);
+		specialChars.put(PUNCTUATION_PLACEHOLDER + "_BP", Characters.PunctuationChineseBopomofo);
 		specialChars.put(PUNCTUATION_PLACEHOLDER + "_ZH", Characters.PunctuationChinese);
 		specialChars.put(PUNCTUATION_PLACEHOLDER + "_FA", Characters.PunctuationFarsi);
 		specialChars.put(PUNCTUATION_PLACEHOLDER + "_FR", Characters.PunctuationFrench);