fix groups (kind of)