Index Bug fixed