Also fixed on opp. index