Resolving potential offset issue with index