NXP-15102 to fixup