Fix in index classes