diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java
index 098f205b3..abbe43819 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java
@@ -508,8 +508,12 @@ public class TranslatorInputMethodService extends InputMethodService
             }
         }
 
-        for (int i = 0; i < keyCodes.length && keyCodes[i] > 0; i++)
-        	mComposing.append((char) keyCodes[i]);
+        if (keyCodes.length > 0 && keyCodes[0] > 0) {
+	        for (int i = 0; i < keyCodes.length && keyCodes[i] > 0; i++)
+	        	mComposing.append((char) keyCodes[i]);
+        } else {
+        	mComposing.append((char) primaryCode);
+        }
 
         if (primaryCode == 10)
         	commitTyped(getCurrentInputConnection());