Close #211: collapse some groups