After fixing index bug