fix to index v2