Trying this fix again for index layout.