Group join fix