diff --git a/mainscripts/Trainer.py b/mainscripts/Trainer.py
index 56bd7cc..9615183 100644
--- a/mainscripts/Trainer.py
+++ b/mainscripts/Trainer.py
@@ -85,6 +85,12 @@ def trainerThread (s2c, c2s, e,
             if model.get_target_iter() != 0:
                 if is_reached_goal:
                     io.log_info('Model already trained to target iteration. You can use preview.')
+                    if os.path.exists(answer_filename):
+                          with open(answer_filename, 'rb') as file:
+                              parameters = pickle.load(file)
+                                if parameters['NoInteractiveMode']:
+                                    model_save()
+                                    os._exit(0)
                 else:
                     io.log_info('Starting. Target iteration: %d. Press "Enter" to stop training and save model.' % ( model.get_target_iter()  ) )
             else:
@@ -164,6 +170,12 @@ def trainerThread (s2c, c2s, e,
                             model_save()
                             is_reached_goal = True
                             io.log_info ('You can use preview now.')
+                            if os.path.exists(answer_filename):
+                                with open(answer_filename, 'rb') as file:
+                                    parameters = pickle.load(file)
+                                    if parameters['NoInteractiveMode']:
+                                      model_save()
+                                      os._exit(0)
                 need_save = False
                 while time.time() - last_save_time >= save_interval_min*60:
                     last_save_time += save_interval_min*60
diff --git a/models/ModelBase.py b/models/ModelBase.py
index dd2c11a..81be71f 100644
--- a/models/ModelBase.py
+++ b/models/ModelBase.py
@@ -296,21 +296,20 @@ class ModelBase(object):
 
     def ask_target_iter(self, default_value=0):
         answer_filename = 'workspace/interact/interact_dict.pkl'
-        #if os.path.exists(answer_filename):
-        #    with open(answer_filename, 'rb') as file:
-        #        parameters = pickle.load(file)
-        #        if parameters['NoInteractiveMode']:
-        #          print("Entro in ask_target_iter")
-        #          default_target_iter = self.load_or_def_option('target_iter', default_value + 10000)
-        #          self.options['target_iter'] = max(0, default_target_iter + 10000)
-        #          print("TARGET ITERATION: " + str(self.options['target_iter']))
-        #        else:
-        #            default_target_iter = self.load_or_def_option('target_iter', default_value)
-        #            self.options['target_iter'] = max(0, io.input_int("Target iteration", default_target_iter))
-        #else:
-        default_target_iter = self.load_or_def_option('target_iter', default_value)
-        self.options['target_iter'] = max(0, io.input_int("Target iteration", default_target_iter))
-        print("Esco")
+        if os.path.exists(answer_filename):
+            with open(answer_filename, 'rb') as file:
+                parameters = pickle.load(file)
+                if parameters['NoInteractiveMode']:
+                  print("Entro in ask_target_iter")
+                  default_target_iter = self.load_or_def_option('target_iter', default_value + 10000)
+                  self.options['target_iter'] = max(0, default_target_iter + 10000)
+                  print("TARGET ITERATION: " + str(self.options['target_iter']))
+                else:
+                    default_target_iter = self.load_or_def_option('target_iter', default_value)
+                    self.options['target_iter'] = max(0, io.input_int("Target iteration", default_target_iter))
+        else:
+            default_target_iter = self.load_or_def_option('target_iter', default_value)
+            self.options['target_iter'] = max(0, io.input_int("Target iteration", default_target_iter))
 
     def ask_random_flip(self):
         default_random_flip = self.load_or_def_option('random_flip', True)