diff --git a/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java b/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java
index 04cf2e6..f6a2c6c 100644
--- a/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java
+++ b/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java
@@ -38,9 +38,9 @@ public class Utils {
 	
 	/**
 	 * Hashtag regex enhanced for ticket #4937
-	 * If you want to accept hashtags of type #X, then you will need to use ^#\\w*[.]*\\w+|\\s#\\w*[.]*\\w+
+	 * If you want to accept hashtags of type #X, then you will need to use ^#\\w*[.]?\\w+|\\s#\\w*[.]?\\w+
 	 */
-	private static final String HASHTAG_REGEX = "^#\\w+[.]*\\w+|\\s#\\w+[.]*\\w+"; 
+	private static final String HASHTAG_REGEX = "^#\\w+[.]?\\w+|\\s#\\w+[.]?\\w+"; 
 
 	/**
 	 * 
diff --git a/src/test/java/org/gcube/social_networking/socialutillibrary/TestUnit.java b/src/test/java/org/gcube/social_networking/socialutillibrary/TestUnit.java
index 09f77d4..47966ad 100644
--- a/src/test/java/org/gcube/social_networking/socialutillibrary/TestUnit.java
+++ b/src/test/java/org/gcube/social_networking/socialutillibrary/TestUnit.java
@@ -2,12 +2,13 @@ package org.gcube.social_networking.socialutillibrary;
 
 import java.util.List;
 
+
 public class TestUnit {
 
 	
 	//@Test
 	public void testHashtag() {
-		String text = "This is a test with hashtag #T6 and #T6.1 but also #T6. that has '.' that is useless.";
+		String text = "This is a test with hashtag #T6 and #T6.1 but also #T6. that has '.' that is useless and #T43..43 .";
 		List<String> hashtags = Utils.getHashTags(text);
 		System.out.println("Hashtags are " + hashtags);
 	}