diff --git a/android/src/main/java/com/expensify/livemarkdown/MarkdownFormatter.java b/android/src/main/java/com/expensify/livemarkdown/MarkdownFormatter.java
index 95760be8..2ef8ccf9 100644
--- a/android/src/main/java/com/expensify/livemarkdown/MarkdownFormatter.java
+++ b/android/src/main/java/com/expensify/livemarkdown/MarkdownFormatter.java
@@ -58,7 +58,7 @@ private void applyRanges(@NonNull SpannableStringBuilder ssb, @NonNull List<Mark
   private void applyRange(@NonNull SpannableStringBuilder ssb, @NonNull MarkdownRange markdownRange, @NonNull MarkdownStyle markdownStyle) {
     String type = markdownRange.getType();
     int start = markdownRange.getStart();
-    int end = start + markdownRange.getLength();
+    int end = markdownRange.getEnd();
     switch (type) {
       case "bold":
         setSpan(ssb, new MarkdownBoldSpan(), start, end);
diff --git a/android/src/main/java/com/expensify/livemarkdown/MarkdownRange.java b/android/src/main/java/com/expensify/livemarkdown/MarkdownRange.java
index 337f1b4a..1fda115b 100644
--- a/android/src/main/java/com/expensify/livemarkdown/MarkdownRange.java
+++ b/android/src/main/java/com/expensify/livemarkdown/MarkdownRange.java
@@ -5,12 +5,14 @@
 public class MarkdownRange {
   private final @NonNull String mType;
   private final int mStart;
+  private final int mEnd;
   private final int mLength;
   private final int mDepth;
 
   public MarkdownRange(@NonNull String type, int start, int length, int depth) {
     mType = type;
     mStart = start;
+    mEnd = start + length;
     mLength = length;
     mDepth = depth;
   }
@@ -23,6 +25,10 @@ public int getStart() {
     return mStart;
   }
 
+  public int getEnd() {
+    return mEnd;
+  }
+
   public int getLength() {
     return mLength;
   }