diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc
index b2ae5fc1d..c2798af77 100644
--- a/rtengine/ipwavelet.cc
+++ b/rtengine/ipwavelet.cc
@@ -2079,7 +2079,8 @@ void ImProcFunctions::WaveletcontAllL(LabImage * labco, float ** varhue, float *
         ContrastResid(WavCoeffs_L0, cp, W_L, H_L, maxp);
     }
 
-    if ((cp.conres >= 0.f || cp.conresH >= 0.f) && cp.resena && !cp.oldsh) { // cp.conres = 0.f and cp.comresH = 0.f means that all will be multiplied by 1.f, so we can skip this step
+ //   if ((cp.conres >= 0.f || cp.conresH >= 0.f) && cp.resena && !cp.oldsh) { // cp.conres = 0.f and cp.comresH = 0.f means that all will be multiplied by 1.f, so we can skip this step
+    if ((cp.conres >= 0.f || cp.conresH >= 0.f) && cp.resena) { // cp.conres = 0.f and cp.comresH = 0.f means that all will be multiplied by 1.f, so we can skip this step
         const std::unique_ptr<LabImage> temp(new LabImage(W_L, H_L));
 #ifdef _OPENMP
         #pragma omp parallel for num_threads(wavNestedLevels) if (wavNestedLevels>1)
@@ -2104,7 +2105,8 @@ void ImProcFunctions::WaveletcontAllL(LabImage * labco, float ** varhue, float *
         }
     }
 
-    if ((cp.conres != 0.f || cp.conresH != 0.f) && cp.resena && cp.oldsh) { // cp.conres = 0.f and cp.comresH = 0.f means that all will be multiplied by 1.f, so we can skip this step
+  //  if ((cp.conres != 0.f || cp.conresH != 0.f) && cp.resena && cp.oldsh) { // cp.conres = 0.f and cp.comresH = 0.f means that all will be multiplied by 1.f, so we can skip this step
+    if ((cp.conres < 0.f || cp.conresH < 0.f) && cp.resena) { // cp.conres = 0.f and cp.comresH = 0.f means that all will be multiplied by 1.f, so we can skip this step
 #ifdef _OPENMP
         #pragma omp parallel for
 #endif
diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc
index ee251f35f..79f4f4e25 100644
--- a/rtgui/wavelet.cc
+++ b/rtgui/wavelet.cc
@@ -854,7 +854,7 @@ Wavelet::Wavelet() :
     thrH->setAdjusterListener(this);
 
     radius->setAdjusterListener(this);
-    radius->hide();
+//    radius->hide();
 
     shFrame->set_label_align(0.025, 0.5);
     ToolParamBlock* const shBox = Gtk::manage(new ToolParamBlock());
@@ -2887,8 +2887,11 @@ void Wavelet::convertParamToNormal()
     disableListener();
     //contrast
     offset->setValue(def_params.offset);
+    sigma->setValue(def_params.sigma);
+    lowthr->setValue(def_params.lowthr);
     //chroma
     expchroma->setEnabled(def_params.expchroma);
+    sigmacol->setValue(def_params.sigmacol);
     CHmethod->set_active(2);
     //denoise
     chromfi->setValue(def_params.chromfi);
@@ -2909,7 +2912,8 @@ void Wavelet::convertParamToNormal()
     edgeampli->setValue(def_params.edgeampli);
     NPmethod->set_active(0);
     //resid
-    oldsh->set_active(true);
+ //   oldsh->set_active(true);
+    radius->setValue(def_params.radius);
     resblur->setValue(def_params.resblur);
     resblurc->setValue(def_params.resblurc);
     cbenab->set_active(false);
@@ -2925,7 +2929,10 @@ void Wavelet::updateGUIToMode(int mode)
 {
     if(mode ==0) {
         offset->hide();
+        sigma->hide();
+        lowthr->hide();
         ctboxch->hide();
+        sigmacol->hide();
         expgamut->hide();
         exptoning->hide();
         chroFrame->hide();
@@ -2933,18 +2940,23 @@ void Wavelet::updateGUIToMode(int mode)
         lipst->hide();
         dirFrame->hide();
         oldsh->hide();
+        radius->hide();
         blurFrame->hide();
         cbenab->hide();
     } else {
         offset->show();
+        sigma->show();
+        lowthr->show();
         ctboxch->show();
+        sigmacol->show();
         expgamut->show();
         exptoning->show();
         chroFrame->show();
         expbl->show();
         lipst->show();
         dirFrame->show();
-        oldsh->show();
+        oldsh->hide();
+        radius->show();
         blurFrame->show();
         cbenab->show();
     }