NXP-15826: fix reindexing