final index fix
final index fix