Fix CDATA issue