Fixed comment_count