Fixed join group issue