Fixed comment count