Fixed comment sort order