Index based lookup fix: return if either index == 0 or index match