Fixing the CDATA issue