[Fix] Fix index/name bug