diff --git a/includes/class-hashtag.php b/includes/class-hashtag.php
index 2d03ac4..789b025 100644
--- a/includes/class-hashtag.php
+++ b/includes/class-hashtag.php
@@ -63,7 +63,7 @@ class Hashtag {
 				$tag = strtolower( $m[2] );
 				if ( '/' === $m[1] ) {
 					// Closing tag.
-					$i = array_search( $tag, $tag_stack );
+					$i = array_search( $tag, $tag_stack, true );
 					// We can only remove the tag from the stack if it is in the stack.
 					if ( false !== $i ) {
 						$tag_stack = array_slice( $tag_stack, 0, $i );
diff --git a/includes/transformer/class-comment.php b/includes/transformer/class-comment.php
index 006280d..e0839ce 100644
--- a/includes/transformer/class-comment.php
+++ b/includes/transformer/class-comment.php
@@ -144,7 +144,7 @@ class Comment {
 		// TODO Delete Or Modify
 		$tags = array();
 
-		$comment_tags = self::get_hashtags();
+		$comment_tags = $this->get_hashtags();
 		if ( $comment_tags ) {
 			foreach ( $comment_tags as $comment_tag ) {
 				$tag_link = \get_tag_link( $comment_tag );