Fixes #324
Fixes #237 - reporting-only group