Fix group mode

I broke it twice, once when merging another pull request and once when
changing how it's called.

Clearly needs tests.