diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 1625f51..e4f8237 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -225,8 +225,8 @@
             hasAutoCorrection = false;
         } else if (null != whitelistedWord) {
             hasAutoCorrection = true;
-        } else if (!AutoCorrection.isWhitelistedOrNotAWord(
-                mDictionaries, consideredWord, wordComposer.isFirstCharCapitalized())) {
+        } else if (!AutoCorrection.isWhitelistedOrNotAWord(mDictionaries, consideredWord,
+                wordComposer.isFirstCharCapitalized())) {
             hasAutoCorrection = true;
         } else if (suggestionsSet.isEmpty()) {
             hasAutoCorrection = false;
@@ -282,7 +282,7 @@
         // a boolean flag. Right now this is handled with a slight hack in
         // WhitelistDictionary#shouldForciblyAutoCorrectFrom.
         final boolean allowsToBeAutoCorrected = AutoCorrection.isWhitelistedOrNotAWord(
-                getUnigramDictionaries(), consideredWord, wordComposer.isFirstCharCapitalized())
+                mDictionaries, consideredWord, wordComposer.isFirstCharCapitalized())
         // If we don't have a main dictionary, we never want to auto-correct. The reason for this
         // is, the user may have a contact whose name happens to match a valid word in their
         // language, and it will unexpectedly auto-correct. For example, if the user types in
