eligible groups and a fix