diff --git a/backend/genesys_gl124.cc b/backend/genesys_gl124.cc
index b6ab01fd2..cc2141a3d 100644
--- a/backend/genesys_gl124.cc
+++ b/backend/genesys_gl124.cc
@@ -2082,7 +2082,7 @@ gl124_feed (Genesys_Device * dev, unsigned int steps, int reverse)
   local_reg = dev->reg;
 
   resolution=sanei_genesys_get_lowest_ydpi(dev);
-  const auto& sensor = sanei_genesys_find_sensor(dev, resolution);
+    const auto& sensor = sanei_genesys_find_sensor(dev, resolution, ScanMethod::FLATBED);
 
     SetupParams params;
     params.xres = resolution;
@@ -2181,7 +2181,7 @@ gl124_search_start_position (Genesys_Device * dev)
 
   // FIXME: the current approach of doing search only for one resolution does not work on scanners
   // whith employ different sensors with potentially different settings.
-  auto& sensor = sanei_genesys_find_sensor_for_write(dev, dpi);
+    auto& sensor = sanei_genesys_find_sensor_for_write(dev, dpi, ScanMethod::FLATBED);
 
     SetupParams params;
     params.xres = dpi;
diff --git a/backend/genesys_gl646.cc b/backend/genesys_gl646.cc
index 4e78bfbb3..4fc211880 100644
--- a/backend/genesys_gl646.cc
+++ b/backend/genesys_gl646.cc
@@ -2481,7 +2481,7 @@ gl646_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
   settings.threshold = 0;
   settings.dynamic_lineart = SANE_FALSE;
 
-  const auto& sensor = sanei_genesys_find_sensor(dev, settings.xres);
+  const auto& sensor = sanei_genesys_find_sensor(dev, settings.xres, ScanMethod::FLATBED);
 
   status = setup_for_scan(dev, sensor, &dev->reg, settings, SANE_TRUE, SANE_TRUE, SANE_TRUE);
   if (status != SANE_STATUS_GOOD)
@@ -2586,7 +2586,7 @@ gl646_search_start_position (Genesys_Device * dev)
 
   // FIXME: the current approach of doing search only for one resolution does not work on scanners
   // whith employ different sensors with potentially different settings.
-  auto& sensor = sanei_genesys_find_sensor_for_write(dev, resolution);
+  auto& sensor = sanei_genesys_find_sensor_for_write(dev, resolution, ScanMethod::FLATBED);
 
   /* fill settings for a gray level scan */
   settings.scan_method = ScanMethod::FLATBED;
@@ -3860,7 +3860,7 @@ gl646_repark_head (Genesys_Device * dev)
   settings.threshold = 0;
   settings.dynamic_lineart = SANE_FALSE;
 
-  const auto& sensor = sanei_genesys_find_sensor(dev, settings.xres);
+  const auto& sensor = sanei_genesys_find_sensor(dev, settings.xres, ScanMethod::FLATBED);
 
   status = setup_for_scan(dev, sensor, &dev->reg, settings, SANE_FALSE, SANE_FALSE, SANE_FALSE);
   if (status != SANE_STATUS_GOOD)
@@ -4367,7 +4367,7 @@ simple_move (Genesys_Device * dev, SANE_Int distance)
 
   int resolution = get_lowest_resolution(dev->model->ccd_type, 3);
 
-  const auto& sensor = sanei_genesys_find_sensor(dev, resolution);
+  const auto& sensor = sanei_genesys_find_sensor(dev, resolution, ScanMethod::FLATBED);
 
   /* TODO give a no AGOHOME flag */
   settings.scan_method = ScanMethod::TRANSPARENCY;
diff --git a/backend/genesys_gl841.cc b/backend/genesys_gl841.cc
index 3e63b8334..43a2909a7 100644
--- a/backend/genesys_gl841.cc
+++ b/backend/genesys_gl841.cc
@@ -3557,7 +3557,7 @@ gl841_search_start_position (Genesys_Device * dev)
 
   // FIXME: the current approach of doing search only for one resolution does not work on scanners
   // whith employ different sensors with potentially different settings.
-  auto& sensor = sanei_genesys_find_sensor_for_write(dev, dpi);
+    auto& sensor = sanei_genesys_find_sensor_for_write(dev, dpi, ScanMethod::FLATBED);
 
     SetupParams params;
     params.xres = dpi;
diff --git a/backend/genesys_gl843.cc b/backend/genesys_gl843.cc
index 0f4ad33ac..19077d001 100644
--- a/backend/genesys_gl843.cc
+++ b/backend/genesys_gl843.cc
@@ -2492,7 +2492,7 @@ gl843_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
   local_reg = dev->reg;
   resolution=sanei_genesys_get_lowest_ydpi(dev);
 
-    const auto& sensor = sanei_genesys_find_sensor(dev, resolution);
+    const auto& sensor = sanei_genesys_find_sensor(dev, resolution, ScanMethod::FLATBED);
 
     ScanSession session;
     session.params.xres = resolution;
@@ -2614,7 +2614,7 @@ gl843_search_start_position (Genesys_Device * dev)
 
     // FIXME: the current approach of doing search only for one resolution does not work on scanners
     // whith employ different sensors with potentially different settings.
-    auto& sensor = sanei_genesys_find_sensor_for_write(dev, dpi);
+    auto& sensor = sanei_genesys_find_sensor_for_write(dev, dpi, ScanMethod::FLATBED);
 
     ScanSession session;
     session.params.xres = dpi;
@@ -2786,7 +2786,7 @@ gl843_feed (Genesys_Device * dev, unsigned int steps)
 
   resolution=sanei_genesys_get_lowest_ydpi(dev);
 
-    const auto& sensor = sanei_genesys_find_sensor(dev, resolution);
+    const auto& sensor = sanei_genesys_find_sensor(dev, resolution, ScanMethod::FLATBED);
 
     ScanSession session;
     session.params.xres = resolution;
diff --git a/backend/genesys_gl846.cc b/backend/genesys_gl846.cc
index 82dc9983a..afb22f07e 100644
--- a/backend/genesys_gl846.cc
+++ b/backend/genesys_gl846.cc
@@ -1807,7 +1807,7 @@ gl846_search_start_position (Genesys_Device * dev)
 
   // FIXME: the current approach of doing search only for one resolution does not work on scanners
   // whith employ different sensors with potentially different settings.
-  auto& sensor = sanei_genesys_find_sensor_for_write(dev, dpi);
+    auto& sensor = sanei_genesys_find_sensor_for_write(dev, dpi, ScanMethod::FLATBED);
 
     SetupParams params;
     params.xres = dpi;
@@ -1974,7 +1974,7 @@ gl846_feed (Genesys_Device * dev, unsigned int steps)
   local_reg = dev->reg;
 
   resolution=sanei_genesys_get_lowest_ydpi(dev);
-  const auto& sensor = sanei_genesys_find_sensor(dev, resolution);
+    const auto& sensor = sanei_genesys_find_sensor(dev, resolution, ScanMethod::FLATBED);
 
     SetupParams params;
     params.xres = resolution;
diff --git a/backend/genesys_gl847.cc b/backend/genesys_gl847.cc
index 00bd1376d..fbfcfd98c 100644
--- a/backend/genesys_gl847.cc
+++ b/backend/genesys_gl847.cc
@@ -1873,7 +1873,7 @@ gl847_search_start_position (Genesys_Device * dev)
 
   // FIXME: the current approach of doing search only for one resolution does not work on scanners
   // whith employ different sensors with potentially different settings.
-  auto& sensor = sanei_genesys_find_sensor_for_write(dev, dpi);
+    auto& sensor = sanei_genesys_find_sensor_for_write(dev, dpi, ScanMethod::FLATBED);
 
     SetupParams params;
     params.xres = dpi;
@@ -2040,7 +2040,7 @@ gl847_feed (Genesys_Device * dev, unsigned int steps)
   local_reg = dev->reg;
 
   resolution=sanei_genesys_get_lowest_ydpi(dev);
-  const auto& sensor = sanei_genesys_find_sensor(dev, resolution);
+    const auto& sensor = sanei_genesys_find_sensor(dev, resolution, ScanMethod::FLATBED);
 
     SetupParams params;
     params.xres = resolution;
diff --git a/backend/genesys_low.h b/backend/genesys_low.h
index 6749f82dc..dafb4e955 100644
--- a/backend/genesys_low.h
+++ b/backend/genesys_low.h
@@ -1750,9 +1750,9 @@ extern void sanei_genesys_init_structs (Genesys_Device * dev);
 const Genesys_Sensor& sanei_genesys_find_sensor_any(Genesys_Device* dev);
 Genesys_Sensor& sanei_genesys_find_sensor_any_for_write(Genesys_Device* dev);
 const Genesys_Sensor& sanei_genesys_find_sensor(Genesys_Device* dev, int dpi,
-                                                ScanMethod scan_method = ScanMethod::FLATBED);
+                                                ScanMethod scan_method);
 Genesys_Sensor& sanei_genesys_find_sensor_for_write(Genesys_Device* dev, int dpi,
-                                                    ScanMethod scan_method = ScanMethod::FLATBED);
+                                                    ScanMethod scan_method);
 
 extern SANE_Status
 sanei_genesys_init_shading_data (Genesys_Device * dev, const Genesys_Sensor& sensor,