Fixed the comment count bug