fix the whole group issue