diff --git a/base.py b/base.py
index dc7a8b0..975e458 100644
--- a/base.py
+++ b/base.py
@@ -110,10 +110,7 @@ class BaseWindow(QMainWindow):
 
             #print("date_str", date_str, flush=True)
 
-            write_message_fired = False 
-            for i, (nfig, name) in enumerate(
-                    zip(self.settings.data["GUI"]["resultsSeq"],
-                        self.settings.data["GUI"]["subResultsTabTitle"])):
+            def extract_and_attach(i, nfig, name):
                 canvas = 'Canvas {0}'.format(i+1)
                 name_base = name.replace(' ', '_').lower()
 
@@ -123,7 +120,6 @@ class BaseWindow(QMainWindow):
                 else:
                     nfig_canvas = nfig
 
-                
                 for idx in range(0, nfig_canvas):
                     if self.all_data['Figure data'][canvas] is not None:
 
@@ -152,6 +148,13 @@ class BaseWindow(QMainWindow):
                       
                         attach_files.append(save_dest)
 
+            write_message_fired = False 
+            for i, (nfig, name) in enumerate(
+                    zip(self.settings.data["GUI"]["resultsSeq"],
+                        self.settings.data["GUI"]["subResultsTabTitle"])):
+                extract_and_attach(i, nfig, name)
+
+            #Not so nice.. send a signal instead?
             if attach_files:            
                 self.parent.attach_files = attach_files
                 print("All files attached", flush=True)