diff --git a/app/build.gradle b/app/build.gradle
index c1e27ca3ef..361abd4068 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId 'com.discord'
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 99115
-        versionName "99.15 - Beta"
+        versionCode 99116
+        versionName "99.16 - Beta"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3471660799..246277d42d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="99115" android:versionName="99.15 - Beta" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="99116" android:versionName="99.16 - Beta" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteExtensionsKt.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteExtensionsKt.java
index c08f5e2f53..50e5d3c840 100644
--- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteExtensionsKt.java
+++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/AutocompleteExtensionsKt.java
@@ -17,7 +17,7 @@ public final class AutocompleteExtensionsKt {
         for (IntRange intRange : u.sortedWith(map.keySet(), new AutocompleteExtensionsKt$replaceAutocompleteDataWithServerValues$$inlined$sortedByDescending$1())) {
             Autocompletable autocompletable = (Autocompletable) map.get(intRange);
             if (autocompletable != null) {
-                if (intRange.getFirst() > str2.length()) {
+                if (intRange.getFirst() > str2.length() || intRange.getLast() > str2.length()) {
                     AppLog appLog = AppLog.g;
                     StringBuilder O = a.O("Invalid mention position to insert ");
                     O.append(autocompletable.getInputReplacement());
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
index cdbff6496d..961e74e1da 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
@@ -313,7 +313,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
         TextView textView = binding.f;
         m.checkNotNullExpressionValue(textView, "appInfoHeader");
         String string = getString(R.string.app_information);
-        textView.setText(string + " - 99.15 - Beta (99115)");
+        textView.setText(string + " - 99.16 - Beta (99116)");
         binding.A.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this));
         binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE);
         binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3f341f3867..f64a6bba56 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1446,7 +1446,7 @@
     <string name="color_picker_title">Select a color</string>
     <string name="color_picker_transparency">Transparency</string>
     <string name="color_picker_use_default">Use Default</string>
-    <string name="res_2131887527_com_crashlytics_android_build_id">3748aa9f75954fa2960a7a09409b799c</string>
+    <string name="res_2131887527_com_crashlytics_android_build_id">feb5024e52c444cb98016148b5f9a6df</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="command_accessibility_desc_app_header_item">Slash command application {applicationName}</string>
     <string name="command_accessibility_desc_app_item">{applicationName} application</string>