issue #810 - Fixing removal / creation of groups