fixes for new group