NXP-14007 (try to) fix delayed indexing