Fixed the index trips