Better support for empty groups