diff --git a/index.php b/index.php
index 18b4bbe..14250e9 100644
--- a/index.php
+++ b/index.php
@@ -250,8 +250,8 @@
 			if(!empty($row['comment'])) {
 				$comment = $row['comment'];
 				$comment = preg_replace('/^&gt;(?!&gt;\d).+/m', '<strong class="quote">$0</strong>', $comment);
-				$comment = preg_replace('/(?:https?|mailto|tel|ftp):[^\s]+/m', '<a href="$0" target="_blank">$0</a>', $comment);
-				$comment = preg_replace_callback('/&gt;&gt;\s*(\d+)/', quote_link, $comment);
+				$comment = preg_replace('/(?:https?|mailto|tel|ftp):[^\s,]+/m', '<a href="$0" target="_blank">$0</a>', $comment);
+				$comment = preg_replace_callback('/&gt;&gt;\s*(\d+)/', 'quote_link', $comment);
 				$comment = str_replace("\n", "<br />", $comment);
 				echo "<div>$comment</div>";
 			}
diff --git a/rss.php b/rss.php
index e2d55ba..9a2b37b 100644
--- a/rss.php
+++ b/rss.php
@@ -63,7 +63,7 @@
 			$comment = $row['comment'];
 			$comment = preg_replace('/^&gt;(?!&gt;\d).+/m', '<strong>$0</strong>', $comment);
 			$comment = preg_replace('/(?:https?|mailto|tel|ftp):[^\s]+/m', '<a href="$0">$0</a>', $comment);
-			$comment = preg_replace_callback('/&gt;&gt;\s*(\d+)/', quote_link, $comment);
+			$comment = preg_replace_callback('/&gt;&gt;\s*(\d+)/', 'quote_link', $comment);
 			$comment = str_replace("\n", "<br />", $comment);
 		}