restoring indexing change that was reverted in previous commit