Fix index interpretation