Bug fix to new group stuff