diff --git a/ibeatles/step6/get.py b/ibeatles/step6/get.py
index 5587a489..752f4289 100644
--- a/ibeatles/step6/get.py
+++ b/ibeatles/step6/get.py
@@ -30,8 +30,10 @@ def strain_mapping(self):
         strain_mapping = (d_array - d0) / d0
 
         if self.parent.min_max['strain_mapping'] is None:
-            self.parent.min_max['strain_mapping'] = {'min': np.min(strain_mapping),
-                                                     'max': np.max(strain_mapping)}
+            self.parent.min_max['strain_mapping'] = {'min': np.nanmin(strain_mapping),
+                                                     'max': np.nanmax(strain_mapping)}
+            self.parent.min_max['strain_mapping'] = {'global_min': np.nanmin(strain_mapping),
+                                                     'global_max': np.nanmax(strain_mapping)}
 
         return strain_mapping
 
diff --git a/ibeatles/step6/strain_mapping_launcher.py b/ibeatles/step6/strain_mapping_launcher.py
index ee4ff2ec..e5d5cdef 100644
--- a/ibeatles/step6/strain_mapping_launcher.py
+++ b/ibeatles/step6/strain_mapping_launcher.py
@@ -85,6 +85,7 @@ def parameters_to_display_changed(self):
 
     def d0_to_use_changed(self):
         self.update_display()
+        self.update_slider_and_lineEdit()
 
     def export_clicked(self):
         o_export = Export(parent=self, grand_parent=self.parent)
@@ -98,6 +99,15 @@ def min_max_value_changed(self):
         o_event = EventHandler(parent=self)
         o_event.min_max_changed()
 
+    def update_slider_and_lineEdit(self):
+        self.update_min_max_values()
+        o_get = Get(parent=self)
+        parameter_displayed = o_get.parameter_to_display()
+        min_value = self.min_max[parameter_displayed]['global_min']
+        max_value = self.min_max[parameter_displayed]['global_max']
+        self.ui.max_range_lineEdit.setText(f"{max_value:.5f}")
+        self.ui.min_range_lineEdit.setText(f"{min_value:.5f}")
+
     def min_max_lineEdit_value_changed(self):
         min_value = float(self.ui.min_range_lineEdit.text())
         max_value = float(self.ui.max_range_lineEdit.text())