tried to fix group handling