diff --git a/pymdwizard/gui/attr.py b/pymdwizard/gui/attr.py
index a399a05b..51555911 100644
--- a/pymdwizard/gui/attr.py
+++ b/pymdwizard/gui/attr.py
@@ -173,11 +173,8 @@ def include_nodata_change(self, b):
             """
         if b:
             self.ui.nodata_section.show()
-            # self.nodata
-            # self.nodata_edom.show()
         else:
             self.ui.nodata_section.hide()
-            # self.nodata = None
 
     def mousePressEvent(self, event):
         self.activate()
@@ -576,6 +573,7 @@ def to_xml(self):
         cur_index = self.ui.comboBox.currentIndex()
 
         if self.active:
+            self.store_current_content()
             domain = self.domain.to_xml()
         elif self._domain_content[cur_index] is not None:
             domain = self._domain_content[cur_index]
@@ -611,6 +609,7 @@ def to_xml(self):
             attrdomv = xml_utils.xml_node("attrdomv", parent_node=attr, index=3)
             attrdomv.append(self.nodata_content[1])
 
+
         return attr
 
     def from_xml(self, attr):