Fix NPC arrow, use iteration index