diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt
index 7e66c15937..da64862c03 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt
@@ -622,7 +622,7 @@ fun stripFormattedTextLink(ft: List<FormattedText>?, link: String): List<Formatt
   val i = result.lastIndex
   if (i >= 0 && result[i].format == null && result[i].text.endsWith("\n")) {
     result[i] = FormattedText(result[i].text.dropLast(1), null)
-    if (result[i].text.isEmpty()) result.removeLast()
+    if (result[i].text.isEmpty()) result.removeAt(result.lastIndex)
   }
   return result.ifEmpty { null }
 }
diff --git a/scripts/simplex-chat-reproduce-builds.sh b/scripts/simplex-chat-reproduce-builds.sh
index d0f121c6ea..5d18b226a8 100755
--- a/scripts/simplex-chat-reproduce-builds.sh
+++ b/scripts/simplex-chat-reproduce-builds.sh
@@ -148,8 +148,9 @@ for os_pair in ${oses}; do
         -t "${container_name}" \
         sh -c 'rm -rf ./dist-newstyle ./apps/multiplatform'
 
-    # Also restore git to previous state
+    # Also restore git to previous state + re-initialize submodules
     git reset --hard && git clean -dfx
+    git submodule update --init --recursive
 
     # Stop containers, delete images
     docker stop "${container_name}"