Fix bug in group handling