diff --git a/src/oca/ruby/OpenNebula/XMLUtils.rb b/src/oca/ruby/OpenNebula/XMLUtils.rb
index fbdee3b79e..912c2e4561 100644
--- a/src/oca/ruby/OpenNebula/XMLUtils.rb
+++ b/src/oca/ruby/OpenNebula/XMLUtils.rb
@@ -214,14 +214,15 @@ module OpenNebula
 
                         str_line << n.collect {|n2|
                             if n2 && n2.class==REXML::Element
-                                str = ind_tab + n2.name + "="
-                                str += n2.text if n2.text
+                                str = ""
+                                str << ind_tab << n2.name << '='
+                                str << attr_to_str(n2.text) if n2.text
                                 str
                             end
-                        }.compact.join(","+ind_enter)
+                        }.compact.join(','+ind_enter)
                         str_line<<" ]"
                     else
-                        str_line<<n.name << "=" << n.text.to_s
+                        str_line << n.name << '=' << attr_to_str(n.text.to_s)
                     end
                     str_line
                 end
@@ -284,6 +285,17 @@ module OpenNebula
 
             hash
         end
+    
+    private
+        def attr_to_str(attr)
+            attr.gsub!('"',"\\\"")
+
+            if attr.match(/[=,' ']/)
+                return '"' + attr + '"'
+            end
+
+            return attr
+        end
     end
 
     ###########################################################################