diff --git a/app/src/main/java/com/gh/common/view/ExpendTextView.java b/app/src/main/java/com/gh/common/view/ExpendTextView.java
index f3ebf3703d..935e40b433 100644
--- a/app/src/main/java/com/gh/common/view/ExpendTextView.java
+++ b/app/src/main/java/com/gh/common/view/ExpendTextView.java
@@ -90,7 +90,8 @@ public class ExpendTextView extends android.support.v7.widget.AppCompatTextView
         SpannableStringBuilder msp = new SpannableStringBuilder(content);
         int length = msp.length();
         int startPosition = length - mExpendText.length();
-        msp.replace(startPosition < 0 ? 0 : startPosition, length, mExpendText);
+        startPosition = startPosition < 0 ? 0 : startPosition;
+        msp.replace(startPosition, length, mExpendText);
         msp.setSpan(new ClickableSpan() {
             @Override
             public void updateDrawState(TextPaint ds) {
@@ -109,7 +110,7 @@ public class ExpendTextView extends android.support.v7.widget.AppCompatTextView
                     mExpandCallback.onExpand();
                 }
             }
-        }, length - mExpendText.length(), length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }, startPosition, length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 
         setText(msp);
         setMovementMethod(CustomLinkMovementMethod.getInstance());