diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index dbd8505..7c27fe9 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -245,18 +245,20 @@
         private static final int MSG_SET_BIGRAM_PREDICTIONS = 7;
         private static final int MSG_PENDING_IMS_CALLBACK = 8;
 
-        private final int mDelayBeforeFadeoutLanguageOnSpacebar;
-        private final int mDelayUpdateSuggestions;
-        private final int mDelayUpdateShiftState;
-        private final int mDurationOfFadeoutLanguageOnSpacebar;
-        private final float mFinalFadeoutFactorOfLanguageOnSpacebar;
-        private final long mDoubleSpacesTurnIntoPeriodTimeout;
-        private final long mIgnoreSpecialKeyTimeout;
+        private int mDelayBeforeFadeoutLanguageOnSpacebar;
+        private int mDelayUpdateSuggestions;
+        private int mDelayUpdateShiftState;
+        private int mDurationOfFadeoutLanguageOnSpacebar;
+        private float mFinalFadeoutFactorOfLanguageOnSpacebar;
+        private long mDoubleSpacesTurnIntoPeriodTimeout;
+        private long mIgnoreSpecialKeyTimeout;
 
         public UIHandler(LatinIME outerInstance) {
             super(outerInstance);
+        }
 
-            final Resources res = outerInstance.getResources();
+        public void onCreate() {
+            final Resources res = getOuterInstance().getResources();
             mDelayBeforeFadeoutLanguageOnSpacebar = res.getInteger(
                     R.integer.config_delay_before_fadeout_language_on_spacebar);
             mDelayUpdateSuggestions =
@@ -497,6 +499,7 @@
         mSubtypeSwitcher = SubtypeSwitcher.getInstance();
         mKeyboardSwitcher = KeyboardSwitcher.getInstance();
         mVibrator = VibratorCompatWrapper.getInstance(this);
+        mHandler.onCreate();
         DEBUG = LatinImeLogger.sDBG;
 
         final Resources res = getResources();
