final index fix