avoid using using one-time indexes
Merge pull request #7 from rlidwka/perf

avoid using using one-time indexes