Escaping for v2 style. Fixe #1543