Fix group add logic