Fixing index setup