Fix generic role