NXP-10235: fix index creation