diff --git a/app/build.gradle b/app/build.gradle
index 02c57fe8..a7b20ccb 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         targetSdkVersion 29
 
         versionCode 27
-        versionName '16.6-a4'
+        versionName '16.6-a5'
 
         multiDexEnabled true
 
diff --git a/app/src/main/java/awais/instagrabber/utils/Utils.java b/app/src/main/java/awais/instagrabber/utils/Utils.java
index 0d6adbf2..bc1c57b3 100755
--- a/app/src/main/java/awais/instagrabber/utils/Utils.java
+++ b/app/src/main/java/awais/instagrabber/utils/Utils.java
@@ -222,6 +222,8 @@ public final class Utils {
                             break;
                         }
                     }
+                    else if (currChar == '.')
+                        break;
 
                     // for merged hashtags
                     if (currChar == '#') {
@@ -233,7 +235,8 @@ public final class Utils {
                         && currChar != ']' && currChar != '\\' && currChar != '=' && currChar != '-' && currChar != '!'
                         && currChar != '$' && currChar != '%' && currChar != '^' && currChar != '&' && currChar != '*'
                         && currChar != '(' && currChar != ')' && currChar != '{' && currChar != '}' && currChar != '/'
-                        && currChar != '|' && currChar != '?' && currChar != '`' && currChar != '~');
+                        && currChar != '|' && currChar != '?' && currChar != '`' && currChar != '~'
+                );
 
                 final int endLen = currChar != '#' ? i : i + 1; // for merged hashtags
                 stringBuilder.setSpan(new CommentMentionClickSpan(), startLen,