fix group handling