try to fix group handling