Added index fix.