Index Bug Fixed