Better putting all in the group, even if it's a work-around