diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 5862661..ba045f1 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -2415,11 +2415,18 @@
   const int mi_row = xd->mi_row;
   const int mi_col = xd->mi_col;
   for (int i = 0; i < num_planes; ++i) {
+#if CONFIG_F054_PIC_BOUNDARY
+    setup_pred_plane(dst + i, dst[i].buf, i ? src->uv_width : src->y_width,
+                     i ? src->uv_height : src->y_height, dst[i].stride, mi_row,
+                     mi_col, i ? scale_uv : scale, xd->plane[i].subsampling_x,
+                     xd->plane[i].subsampling_y, &xd->mi[0]->chroma_ref_info);
+#else
     setup_pred_plane(
         dst + i, dst[i].buf, i ? src->uv_crop_width : src->y_crop_width,
         i ? src->uv_crop_height : src->y_crop_height, dst[i].stride, mi_row,
         mi_col, i ? scale_uv : scale, xd->plane[i].subsampling_x,
         xd->plane[i].subsampling_y, &xd->mi[0]->chroma_ref_info);
+#endif  // CONFIG_F054_PIC_BOUNDARY
   }
 }
 
diff --git a/av1/encoder/reconinter_enc.c b/av1/encoder/reconinter_enc.c
index 11778fe..15930d6 100644
--- a/av1/encoder/reconinter_enc.c
+++ b/av1/encoder/reconinter_enc.c
@@ -68,8 +68,10 @@
       orig_pos_y += src_mv->row * (1 << (1 - ssy));
       orig_pos_x += src_mv->col * (1 << (1 - ssx));
     }
-    int pos_y = sf->scale_value_y(orig_pos_y, sf);
-    int pos_x = sf->scale_value_x(orig_pos_x, sf);
+    int pos_y =
+        sf->scale_value_y ? sf->scale_value_y(orig_pos_y, sf) : orig_pos_y;
+    int pos_x =
+        sf->scale_value_x ? sf->scale_value_x(orig_pos_x, sf) : orig_pos_x;
     pos_x += SCALE_EXTRA_OFF;
     pos_y += SCALE_EXTRA_OFF;