NXP-13393: proper escaping