Added fixed save indexing.