Fixed grouping by class name