fix for grps and for linking