Fixing index again