Fix index to be correct with the new tab setup...