addIndex is lazy, not need to check is index is here
Small code movement