diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
index add80ba15..3f5f24bb5 100644
--- a/rtengine/dcraw.cc
+++ b/rtengine/dcraw.cc
@@ -7023,7 +7023,7 @@ void CLASS adobe_coeff (const char *make, const char *model)
       }
       break;
     }
-  if (strcmp(make, "Sony") == 0 && table[i].black > 0 && table[i].black < 400) { // RT: arw2 scale fix
+  if (load_raw == &CLASS sony_arw2_load_raw) { // RT: arw2 scale fix
       black <<= 2;
   }
   { /* Check for RawTherapee table overrides and extensions */
diff --git a/rtengine/dcraw.patch b/rtengine/dcraw.patch
index 13727dbf0..5fb069f00 100755
--- a/rtengine/dcraw.patch
+++ b/rtengine/dcraw.patch
@@ -1,5 +1,5 @@
 --- dcraw.c	2013-11-07 16:47:20.881721251 +0100
-+++ dcraw.cc	2013-11-18 11:32:46.856425587 +0100
++++ dcraw.cc	2013-12-16 15:36:08.177247923 +0100
 @@ -1,3 +1,15 @@
 +/*RT*/#include <glib.h>
 +/*RT*/#include <glib/gstdio.h>
@@ -797,7 +797,7 @@
        }
        break;
      }
-+  if (strcmp(make, "Sony") == 0 && table[i].black > 0 && table[i].black < 400) { // RT: arw2 scale fix
++  if (load_raw == &CLASS sony_arw2_load_raw) { // RT: arw2 scale fix
 +      black <<= 2;
 +  }
 +  { /* Check for RawTherapee table overrides and extensions */