diff --git a/fp-includes/core/core.fpdb.class.php b/fp-includes/core/core.fpdb.class.php
index 5b9fe14..6a6266b 100644
--- a/fp-includes/core/core.fpdb.class.php
+++ b/fp-includes/core/core.fpdb.class.php
@@ -376,6 +376,11 @@
 				$v = $idx->getitem($key);
 				if ($qp->fullparse) {
 					$entry = entry_parse($qp->id);
+					if ($entry && $qp->comments) {
+						$this->comments = new FPDB_CommentList($qp->id, comment_getlist($qp->id));
+						$entry['comments'] = $this->comments->getCount();
+					}
+			
 					if (!$entry)  return $return;
 				} else {
 				 	$entry = array('subject' => $v);