one last tweak on index