2007: index and fixup