Fixed the indexes