Fix bug with first entry not under a group