indexer fix, but doesnt work :(