Fixing multiple groups with same name