Adding fix for groups.