diff --git a/project/java/Settings.java b/project/java/Settings.java
index 53c1f15a8..29409f69d 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -1733,7 +1733,7 @@ class Settings
 			}
 
 			for( int i = 0; i < Math.min(6, Globals.AppTouchscreenKeyboardKeysNames.length); i++ )
-				items[i+2] += " - " + Globals.AppTouchscreenKeyboardKeysNames[i];
+				items[i+2] = items[i+2] + " - " + Globals.AppTouchscreenKeyboardKeysNames[i];
 
 			AlertDialog.Builder builder = new AlertDialog.Builder(p);
 			builder.setTitle(p.getResources().getString(R.string.remap_screenkb));
@@ -1776,7 +1776,7 @@ class Settings
 			};
 
 			for( int i = 0; i < Math.min(6, Globals.AppTouchscreenKeyboardKeysNames.length); i++ )
-				items[i] += " - " + Globals.AppTouchscreenKeyboardKeysNames[i];
+				items[i] = items[i] + " - " + Globals.AppTouchscreenKeyboardKeysNames[i];
 
 			if( currentButton >= Globals.RemapScreenKbKeycode.length )
 			{
diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius
index 6f28771d5..cdd8564eb 160000
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius
@@ -1 +1 @@
-Subproject commit 6f28771d57ca7d878e3cfee08014651b854b9c7f
+Subproject commit cdd8564ebdd26b6c733bad120a8df44e11edc041