diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 3289d6a23ef0b51f32813c38bb4868b05007c380..851066de591e8663d39a73ff7e6547b78ab52c48 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -413,11 +413,11 @@ public class Suggest {
             // Check the last one's score and bail
             if (suggestions.size() >= prefMaxSuggestions
                     && suggestions.get(prefMaxSuggestions - 1).mScore >= score) return true;
-            final int length = Character.codePointCount(word, 0, word.length());
+            final int length = wordInfo.mCodePointCount;
             while (pos < suggestions.size()) {
                 final int curScore = suggestions.get(pos).mScore;
                 if (curScore < score
-                        || (curScore == score && length < suggestions.get(pos).codePointCount())) {
+                        || (curScore == score && length < suggestions.get(pos).mCodePointCount)) {
                     break;
                 }
                 pos++;