diff --git a/rtengine/guidedfilter.cc b/rtengine/guidedfilter.cc
index 6b2adb773..ad3beec51 100644
--- a/rtengine/guidedfilter.cc
+++ b/rtengine/guidedfilter.cc
@@ -106,7 +106,18 @@ void guidedFilter(const array2D<float> &guide, const array2D<float> &src, array2
     const auto f_subsample =
         [multithread](array2D<float> &d, const array2D<float> &s) -> void
         {
-            rescaleBilinear(s, d, multithread);
+            if (d.width() == s.width() && d.height() == s.height()) {
+#ifdef _OPENMP
+                #pragma omp parallel for if (multithread)
+#endif
+                for (int y = 0; y < s.height(); ++y) {
+                    for (int x = 0; x < s.width(); ++x) {
+                        d[y][x] = s[y][x];
+                    }
+                }
+            } else {
+                rescaleBilinear(s, d, multithread);
+            }
         };
 
     const auto f_mean =
diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc
index be21512d5..1a8391f66 100644
--- a/rtgui/lensprofile.cc
+++ b/rtgui/lensprofile.cc
@@ -586,6 +586,9 @@ void LensProfilePanel::onCorrModeChanged(const Gtk::RadioButton* rbChanged)
 
 LensProfilePanel::LFDbHelper::LFDbHelper()
 {
+    lensfunCameraModel = Gtk::TreeStore::create(lensfunModelCam);
+    lensfunLensModel = Gtk::TreeStore::create(lensfunModelLens);
+
 #ifdef _OPENMP
 #pragma omp parallel sections if (!settings->verbose)
 #endif
@@ -594,14 +597,12 @@ LensProfilePanel::LFDbHelper::LFDbHelper()
 #pragma omp section
 #endif
         {
-            lensfunCameraModel = Gtk::TreeStore::create(lensfunModelCam);
             fillLensfunCameras();
         }
 #ifdef _OPENMP
 #pragma omp section
 #endif
         {
-            lensfunLensModel = Gtk::TreeStore::create(lensfunModelLens);
             fillLensfunLenses();
         }
     }