Fixed index_name bug