Bug squash on adding new groups