diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc
index 1396ae245..da89810c4 100644
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -5462,6 +5462,8 @@ void RawImageSource::getRawValues(int x, int y, int rotate, int &R, int &G, int
         ynew = H - 1 - ynew;
     }
 
+    xnew = LIM(xnew, 0, W - 1);
+    ynew = LIM(ynew, 0, H - 1);
     int c = ri->getSensorType() == ST_FUJI_XTRANS ? ri->XTRANSFC(ynew,xnew) : ri->FC(ynew,xnew);
     int val = round(rawData[ynew][xnew] / scale_mul[c]);
     if(c == 0) {