Fix group handling
Minor