New index with bug fix