addrindex fix: removed incorrect optimization