Fix bug with missing groupnames