diff --git a/pandora_agents/win32/modules/pandora_module.cc b/pandora_agents/win32/modules/pandora_module.cc
index d7d5fb63c0..eac38c8fa1 100644
--- a/pandora_agents/win32/modules/pandora_module.cc
+++ b/pandora_agents/win32/modules/pandora_module.cc
@@ -532,6 +532,7 @@ Pandora_Module::getXml () {
 				try {
 					data_clean = strreplace (this->getDataOutput (data),
 								 "%", "%%" );
+					data_clean = strreplace (data_clean, "]]>", "]]><![CDATA[");
 				} catch (Module_Exception e) {
 					continue;
 				}
@@ -542,6 +543,7 @@ Pandora_Module::getXml () {
 			data = data_list->front ();
 			try {
 				data_clean = strreplace (this->getDataOutput (data), "%", "%%" );
+				data_clean = strreplace (data_clean, "]]>", "]]><![CDATA[");
 				module_xml += data_clean;
 
 			} catch (Module_Exception e) {