diff --git a/app/build.gradle b/app/build.gradle
index 34e1458..93621e3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,7 +17,7 @@ android {
         minSdkVersion 27
         targetSdkVersion 34
         versionCode 4
-        versionName "0.2.1-SNAPSHOT"
+        versionName "0.2.0.1"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         signingConfig signingConfigs.release
     }
diff --git a/app/src/main/java/org/exbin/bined/android/basic/DefaultCodeAreaCommandHandler.java b/app/src/main/java/org/exbin/bined/android/basic/DefaultCodeAreaCommandHandler.java
index 6fba123..579d5c7 100644
--- a/app/src/main/java/org/exbin/bined/android/basic/DefaultCodeAreaCommandHandler.java
+++ b/app/src/main/java/org/exbin/bined/android/basic/DefaultCodeAreaCommandHandler.java
@@ -240,7 +240,7 @@ public void keyPressed(KeyEvent keyEvent) {
 //                keyEvent.consume();
                 break;
             }
-            case KeyEvent.KEYCODE_DEL: {
+            case KeyEvent.KEYCODE_FORWARD_DEL: {
                 EditMode editMode = ((EditModeCapable) codeArea).getEditMode();
                 if (editMode == EditMode.EXPANDING) {
                     deletePressed();
@@ -248,7 +248,7 @@ public void keyPressed(KeyEvent keyEvent) {
                 }
                 break;
             }
-            case KeyEvent.KEYCODE_BACK: {
+            case KeyEvent.KEYCODE_DEL: {
                 EditMode editMode = ((EditModeCapable) codeArea).getEditMode();
                 if (editMode == EditMode.EXPANDING) {
                     backSpacePressed();
diff --git a/app/src/main/java/org/exbin/bined/editor/android/MainActivity.java b/app/src/main/java/org/exbin/bined/editor/android/MainActivity.java
index 5def0c9..fe4818c 100644
--- a/app/src/main/java/org/exbin/bined/editor/android/MainActivity.java
+++ b/app/src/main/java/org/exbin/bined/editor/android/MainActivity.java
@@ -170,16 +170,25 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
             @Override
             public boolean onKey(View view, int keyCode, KeyEvent keyEvent) {
-                if (keyEvent.getAction() == KeyEvent.ACTION_DOWN) {
-                    keyListener.onKeyDown(view, editable, keyCode, keyEvent);
-                    processKeys(keyEvent);
-                } else if (keyEvent.getAction() == KeyEvent.ACTION_UP) {
-                    commandHandler.keyPressed(keyEvent);
-                } else {
-                    keyListener.onKeyOther(view, editable, keyEvent);
-                    processKeys(keyEvent);
+                try {
+                    if (keyEvent.getAction() == KeyEvent.ACTION_DOWN) {
+                        if (keyEvent.getKeyCode() == KeyEvent.KEYCODE_DEL || keyEvent.getKeyCode() == KeyEvent.KEYCODE_FORWARD_DEL) {
+                            commandHandler.keyPressed(keyEvent);
+                        } else {
+                            keyListener.onKeyDown(view, editable, keyCode, keyEvent);
+                            processKeys(keyEvent);
+                        }
+                    } else if (keyEvent.getAction() == KeyEvent.ACTION_UP) {
+                        commandHandler.keyPressed(keyEvent);
+                    } else {
+                        keyListener.onKeyOther(view, editable, keyEvent);
+                        processKeys(keyEvent);
+                    }
+                    return true;
+                } catch (Exception ex) {
+                    // ignore
                 }
-                return true;
+                return false;
             }
 
             private void processKeys(KeyEvent keyEvent) {
@@ -539,11 +548,11 @@ public void buttonActionInsert(View view) {
     }
 
     public void buttonActionDelete(View view) {
-        codeArea.getCommandHandler().keyPressed(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL));
+        codeArea.getCommandHandler().keyPressed(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_FORWARD_DEL));
     }
 
     public void buttonActionBk(View view) {
-        codeArea.getCommandHandler().keyPressed(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK));
+        codeArea.getCommandHandler().keyPressed(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL));
     }
 
     public void buttonActionTab(View view) {
diff --git a/app/src/main/java/org/exbin/bined/operation/android/CodeAreaOperationCommandHandler.java b/app/src/main/java/org/exbin/bined/operation/android/CodeAreaOperationCommandHandler.java
index 40207c9..5a1d768 100644
--- a/app/src/main/java/org/exbin/bined/operation/android/CodeAreaOperationCommandHandler.java
+++ b/app/src/main/java/org/exbin/bined/operation/android/CodeAreaOperationCommandHandler.java
@@ -259,12 +259,12 @@ public void keyPressed(KeyEvent keyEvent) {
                 }
                 break;
             }
-            case KeyEvent.KEYCODE_DEL: {
+            case KeyEvent.KEYCODE_FORWARD_DEL: {
                 deletePressed();
 //                keyEvent.consume();
                 break;
             }
-            case KeyEvent.KEYCODE_BACK: {
+            case KeyEvent.KEYCODE_DEL: {
                 backSpacePressed();
 //                keyEvent.consume();
                 break;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 153554d..bfe3747 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,7 +41,7 @@
 
     <string name="action_exit">Exit</string>
     <string name="exampleString">Test</string>
-    <string name="app_about">Name: BinEd - Binary/Hex Editor\nVersion: 0.2.1 SNAPSHOT\nVendor: <a href="https://exbin.org">ExBin Project</a>\nLicense: <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>\nHomepage: <a href="https://bined.exbin.org/android">https://bined.exbin.org/android</a></string>
+    <string name="app_about">Name: BinEd - Binary/Hex Editor\nVersion: 0.2.0.1\nVendor: <a href="https://exbin.org">ExBin Project</a>\nLicense: <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>\nHomepage: <a href="https://bined.exbin.org/android">https://bined.exbin.org/android</a></string>
     <string name="bined_logo_description">BinEd Logo</string>
     <string name="pref_header_appearance">Appearance</string>
     <string name="title_activity_settings2">SettingsActivity2</string>
diff --git a/fastlane/metadata/android/en-US/changelogs/3.txt b/fastlane/metadata/android/en-US/changelogs/4.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/3.txt
rename to fastlane/metadata/android/en-US/changelogs/4.txt