hotfix potential multiple indexing bugs