diff --git a/java/src/com/android/inputmethod/latin/WordComposer.java b/java/src/com/android/inputmethod/latin/WordComposer.java
index e97cb24bac10a7247c7238160481ba94b13aad36..8d8e3519791559f0df5502502eaa30bc7a510ba9 100644
--- a/java/src/com/android/inputmethod/latin/WordComposer.java
+++ b/java/src/com/android/inputmethod/latin/WordComposer.java
@@ -84,10 +84,26 @@ public class WordComposer {
      */
     public void add(int primaryCode, int[] codes) {
         mTypedWord.append((char) primaryCode);
+        correctPrimaryJuxtapos(primaryCode, codes);
         mCodes.add(codes);
         if (Character.isUpperCase((char) primaryCode)) mCapsCount++;
     }
 
+    /**
+     * Swaps the first and second values in the codes array if the primary code is not the first
+     * value in the array but the second. This happens when the preferred key is not the key that
+     * the user released the finger on.
+     * @param primaryCode the preferred character
+     * @param codes array of codes based on distance from touch point
+     */
+    private void correctPrimaryJuxtapos(int primaryCode, int[] codes) {
+        if (codes.length < 2) return;
+        if (codes[0] > 0 && codes[1] > 0 && codes[0] != primaryCode && codes[1] == primaryCode) {
+            codes[1] = codes[0];
+            codes[0] = primaryCode;
+        }
+    }
+
     /**
      * Delete the last keystroke as a result of hitting backspace.
      */