Fixed nested group issue