Fixed group issue