applied fix for multiple groups