One more try for the indexes fix