fixed add and removing on groups