Handle trivial groups correctly (again)