Fix incorrect grouping for tidy data set 2