removegroup fix reverted