diff --git a/src/lib/ui/player/IMEHelper.ts b/src/lib/ui/player/IMEHelper.ts
index 49d8e15..6059509 100644
--- a/src/lib/ui/player/IMEHelper.ts
+++ b/src/lib/ui/player/IMEHelper.ts
@@ -36,7 +36,7 @@ export const composeMap = new Map(Object.entries({
   'ざ': 'さ', 'じ': 'し', 'ず': 'す', 'ぜ': 'せ', 'ぞ': 'そ',
   'だ': 'た', 'ぢ': 'ち', 'づ': 'つ', 'で': 'て', 'ど': 'と',
   'ば': 'は', 'び': 'ひ', 'ぶ': 'ふ', 'べ': 'へ', 'ぼ': 'ほ',
-  'ぱ': 'ば', 'ぴ': 'び', 'ぷ': 'ぶ', 'ぺ': 'べ', 'ぽ': 'ぼ',
+  'ぱ': 'ばは', 'ぴ': 'びひ', 'ぷ': 'ぶふ', 'ぺ': 'べへ', 'ぽ': 'ぼほ',
 }))
 export const composeList = Array.from(composeMap.keys())
 
diff --git a/src/routes/song/[id]/play/+page.svelte b/src/routes/song/[id]/play/+page.svelte
index d101ae6..c6fe6f4 100644
--- a/src/routes/song/[id]/play/+page.svelte
+++ b/src/routes/song/[id]/play/+page.svelte
@@ -117,7 +117,7 @@
       let res = fuzzyEquals(char, exp)
       // Need to compose, stop here
       if (res !== 'right' && !imeUsed && !isComposed 
-        && composeList.includes(exph) && composeMap.get(exph) === char
+        && composeList.includes(exph) && composeMap.get(exph)?.includes(char)
         && inp.length === 1
       ) return
       states[li][wi] = res