BugFix: group adding and removing