diff --git a/include/functions.php b/include/functions.php
index 0231c52de..1970dcd60 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -4647,6 +4647,12 @@
 
 				$headline_row["feed_title"] = $line["feed_title"];
 
+				if (!$line["comments"] && $line["num_comments"] > 0)
+					$line["comments"] = $line["link"];
+
+				$headline_row["comments_count"] = (int)$line["num_comments"];
+				$headline_row["comments_link"] = $line["comments"];
+
 				array_push($headlines, $headline_row);
 			}