Playing with Index to bug fix