OZP-648: Fixing automatic in Group