fix group finding