Made sample match new index order