addrindex fix: removed incorrect optimization
Merge pull request #5 from ClearingHouse/addrindex

addrindex fix: removed incorrect optimization