diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 7e8020a0ff..3eed4b3c87 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -1375,7 +1375,7 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
 
         for (c = 0; c < channel_count; c++) {
             int plane = s->desc->comp[c].plane;
-            ptr = p->data[plane] + window_ymin * p->linesize[plane] + (window_xmin * 4);
+            ptr = p->data[plane] + window_ymin * p->linesize[plane] + (window_xmin * step);
 
             for (i = 0; i < ysize; i++, ptr += p->linesize[plane]) {
                 const uint8_t *src;
diff --git a/tests/ref/fate/exr-rgb-tile-half-piz-dw-large b/tests/ref/fate/exr-rgb-tile-half-piz-dw-large
index 196b9b155b..6ad531a4c9 100644
--- a/tests/ref/fate/exr-rgb-tile-half-piz-dw-large
+++ b/tests/ref/fate/exr-rgb-tile-half-piz-dw-large
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 50x50
 #sar 0: 1/1
-0,          0,          0,        1,    30000, 0xa02a541c
+0,          0,          0,        1,    30000, 0xef01f54f
diff --git a/tests/ref/fate/exr-rgb-tile-half-zip b/tests/ref/fate/exr-rgb-tile-half-zip
index 0ad1a47dbe..afadee5995 100644
--- a/tests/ref/fate/exr-rgb-tile-half-zip
+++ b/tests/ref/fate/exr-rgb-tile-half-zip
@@ -3,4 +3,4 @@
 #codec_id 0: rawvideo
 #dimensions 0: 501x401
 #sar 0: 1/1
-0,          0,          0,        1,  2410812, 0x0deb5853
+0,          0,          0,        1,  2410812, 0x30fd8688