QAART-228 groups fix