NXP-10782 - better regexp