same fix for groups