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 34d5212..eba6069 100644
--- a/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java
+++ b/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java
@@ -39,7 +39,7 @@ public class Utils {
 	/**
 	 * Hashtag regex enhanced for ticket #4937
 	 */
-	private static final String HASHTAG_REGEX = "^#\\w+([.]?\\w+)*|\\s#\\w+([.]?\\w+)*";
+	private static final String HASHTAG_REGEX = "^#\\w+([.]?\\w+)*|\\s#\\w+([.]?\\w+)*|#\\w+([.]?\\w+)*";
 
 	/**
 	 * Pattern for URLS
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 10c8be4..65eba2c 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,14 @@ package org.gcube.social_networking.socialutillibrary;
 
 import java.util.List;
 
+import org.junit.Test;
+
 
 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 and #T43.43 and #gcube4.1.0gcore #gcube4.1.0";
+		String text = "This is a test with hashtag #T6 and #T6.1 but also #T6. that has '.' that is useless and #T43.43 and #gcube4.1.0gcore #gcube4.1.0 and (#ga) tewrw";
 		List<String> hashtags = Utils.getHashTags(text);
 		System.out.println("Hashtags are " + hashtags);
 	}