Fix index to use correct base