more fixing indexes