Index localization fix