perhaps fixed some Group_Remove issues