diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index ffac602..0efe0eb 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -43,7 +43,7 @@
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.text.InputType;
-import android.text.SpannableString;
+import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.style.SuggestionSpan;
 import android.util.Log;
@@ -2517,10 +2517,10 @@
         final ArrayList<SuggestedWordInfo> suggestions = CollectionUtils.newArrayList();
         final CharSequence word = range.mWord;
         final String typedWord = word.toString();
-        if (word instanceof SpannableString) {
-            final SpannableString spannableString = (SpannableString)word;
+        if (word instanceof Spanned) {
+            final Spanned spanned = (Spanned)word;
             int i = 0;
-            for (Object object : spannableString.getSpans(0, spannableString.length(),
+            for (Object object : spanned.getSpans(0, spanned.length(),
                     SuggestionSpan.class)) {
                 SuggestionSpan span = (SuggestionSpan)object;
                 for (String s : span.getSuggestions()) {
