1646 hotfix indexing