diff --git a/dependencies/extension-api/src/org/haxe/lime/Lime.java b/dependencies/extension-api/src/org/haxe/lime/Lime.java
index 383da87dd..32834bf75 100644
--- a/dependencies/extension-api/src/org/haxe/lime/Lime.java
+++ b/dependencies/extension-api/src/org/haxe/lime/Lime.java
@@ -22,7 +22,7 @@ public class Lime {
      public static native int onTrackball(float x,float y);
      public static native int onJoyChange(int inDeviceID, int inCode, boolean inIsDown);
      public static native int onJoyMotion(int inDeviceID, int axis, float value);
-     public static native int onKeyChange(int inCode, boolean inIsDown);
+     public static native int onKeyChange(int inKeyCode, int inCharCode, boolean inIsDown);
      public static native int onRender();
      public static native int onPoll();
      public static native double getNextWake();
diff --git a/templates/android/template/src/org/haxe/lime/MainView.java b/templates/android/template/src/org/haxe/lime/MainView.java
index ae36807ec..0dec184ce 100644
--- a/templates/android/template/src/org/haxe/lime/MainView.java
+++ b/templates/android/template/src/org/haxe/lime/MainView.java
@@ -368,7 +368,7 @@ class MainView extends GLSurfaceView {
 		
 		final int charCode = translateKey (inKeyCode, event);
 		
-		if (keyCode != 0) {
+		if (charCode != 0) {
 			
 			queueEvent (new Runnable () {
 				
@@ -417,7 +417,7 @@ class MainView extends GLSurfaceView {
 		
 		final int charCode = translateKey (inKeyCode, event);
 		
-		if (keyCode != 0) {
+		if (charCode != 0) {
 			
 			queueEvent (new Runnable () {