Class index fix