diff --git a/assets/keylayout/cj5-sc.han b/assets/keylayout/cj5-sc.han
index c0791f06e..267dde6a2 100644
--- a/assets/keylayout/cj5-sc.han
+++ b/assets/keylayout/cj5-sc.han
@@ -8440,7 +8440,6 @@ xxi,丶
 xr,。
 xxr,〇
 xxxxx,〇
-zxaa,　
 zxab,，
 zxac,、
 zxad,。
diff --git a/assets/keylayout/cj5-tc.han b/assets/keylayout/cj5-tc.han
index 761f8ed79..c697bfe81 100644
--- a/assets/keylayout/cj5-tc.han
+++ b/assets/keylayout/cj5-tc.han
@@ -14309,7 +14309,6 @@ yyyyl,ㄦ
 yyyym,ˊ
 yyyyn,ˇ
 yyyyo,ˋ
-zxaa,　
 zxab,，
 zxac,、
 zxad,。
diff --git a/src/net/torvald/terrarum/gamecontroller/IMEProviderDelegate.kt b/src/net/torvald/terrarum/gamecontroller/IMEProviderDelegate.kt
index 70a5819c0..17ac6c89d 100644
--- a/src/net/torvald/terrarum/gamecontroller/IMEProviderDelegate.kt
+++ b/src/net/torvald/terrarum/gamecontroller/IMEProviderDelegate.kt
@@ -57,9 +57,9 @@ class IMEDictionary(private val filename: String) {
         var index = keys.searchForInterval(key) { it }.second
 
         val allRelevantKeys = ArrayList<String>() // oh, oha, ohag, ohbt, ohby, ...
-        for (i in 0 until 400) { // lookahead for length-first sorting, longest lookahead possible is around 300, so I'll give it 400
-            if (index + 1 >= keys.size) break
-            val keysym = keys[index + i]
+        for (k in 0 until 400) { // lookahead for length-first sorting, longest lookahead possible is around 300, so I'll give it 400
+            if (index + k >= keys.size) break
+            val keysym = keys[index + k]
             if (!keysym.startsWith(key)) break
             allRelevantKeys.add(keysym)
         }