Fixing index shit