Fix cdata handling