another fix in group entities