Hotfix in the index window