diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index bf3d9c45d10b000f338cd7c746e6fb380d9c59c9..3a24c9f4406eb843954c64b838bc710b831a6ec4 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -230,19 +230,17 @@ public class Suggest {
         if (isCorrectionEnabled) {
             final SuggestedWordInfo bestSuggestion = suggestionsSet.isEmpty()
                     ? null : suggestionsSet.first();
-            final CharSequence autoCorrection;
             if (null != whitelistedWord) {
-                autoCorrection = whitelistedWord;
+                hasAutoCorrection = true;
             } else if (!AutoCorrection.isWhitelistedOrNotAWord(
                     mDictionaries, consideredWord, false)) {
-                autoCorrection = consideredWord;
+                hasAutoCorrection = true;
             } else if (AutoCorrection.hasAutoCorrectionForBinaryDictionary(bestSuggestion,
                             consideredWord, mAutoCorrectionThreshold)) {
-                autoCorrection = bestSuggestion.mWord;
+                hasAutoCorrection = true;
             } else {
-                autoCorrection = null;
+                hasAutoCorrection = false;
             }
-            hasAutoCorrection = (null != autoCorrection);
         } else {
             hasAutoCorrection = false;
         }