Fix group ids