Same fix as previous commit, but for group