MANTA-42 fix the index fix...