diff --git a/leankeykeyboard/build.gradle b/leankeykeyboard/build.gradle
index 9bff3fe..3ac1f49 100644
--- a/leankeykeyboard/build.gradle
+++ b/leankeykeyboard/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "org.liskovsoft.leankeykeyboard.pro"
         minSdkVersion project.properties.minSdkVersion
         targetSdkVersion project.properties.targetSdkVersion
-        versionCode 186
-        versionName "6.1.16"
+        versionCode 187
+        versionName "6.1.17"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
diff --git a/leankeykeyboard/src/main/AndroidManifest.xml b/leankeykeyboard/src/main/AndroidManifest.xml
index a071801..7f09aba 100644
--- a/leankeykeyboard/src/main/AndroidManifest.xml
+++ b/leankeykeyboard/src/main/AndroidManifest.xml
@@ -83,7 +83,7 @@
         </activity>
 
         <service
-            android:name="com.liskovsoft.leankeyboard.ime.KeyMapperImeService"
+            android:name="com.liskovsoft.leankeyboard.ime.LeanbackImeService"
             android:label="@string/ime_service_name"
             android:permission="android.permission.BIND_INPUT_METHOD">
             <intent-filter>
diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/KeyMapperImeService.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/KeyMapperImeService.java
index 5bc3aa9..7a28f4c 100644
--- a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/KeyMapperImeService.java
+++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/KeyMapperImeService.java
@@ -4,11 +4,12 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.inputmethodservice.InputMethodService;
 import android.view.KeyEvent;
 import android.view.inputmethod.InputConnection;
 import com.liskovsoft.leankeykeyboard.BuildConfig;
 
-public class KeyMapperImeService extends LeanbackImeService {
+public class KeyMapperImeService extends InputMethodService {
     private static final String KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_DOWN_UP = BuildConfig.APPLICATION_ID + ".inputmethod.ACTION_INPUT_DOWN_UP";
     private static final String KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_DOWN = BuildConfig.APPLICATION_ID + ".inputmethod.ACTION_INPUT_DOWN";
     private static final String KEY_MAPPER_INPUT_METHOD_ACTION_INPUT_UP = BuildConfig.APPLICATION_ID + ".inputmethod.ACTION_INPUT_UP";
diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/LeanbackImeService.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/LeanbackImeService.java
index 0f6ee88..b73e656 100644
--- a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/LeanbackImeService.java
+++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/ime/LeanbackImeService.java
@@ -20,7 +20,7 @@ import androidx.core.text.BidiFormatter;
 import com.liskovsoft.leankeyboard.ime.LeanbackKeyboardController.InputListener;
 import com.liskovsoft.leankeyboard.utils.LeanKeyPreferences;
 
-public class LeanbackImeService extends InputMethodService {
+public class LeanbackImeService extends KeyMapperImeService {
     private static final String TAG = LeanbackImeService.class.getSimpleName();
     private static final boolean DEBUG = false;
     public static final String IME_CLOSE = "com.google.android.athome.action.IME_CLOSE";