diff --git a/Jenkinsfile b/Jenkinsfile
index 7ca498696b..d78ed6f5c9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 @Library('pipeline-library')_
-FullVitisLibPipeline (branch: 'next', libname: 'Vitis_Libraries', TARGETS: 'hls_csim:hls_csynth:hls_cosim:hls_vivado_impl:vitis_sw_emu:vitis_hw_emu:vitis_hw_build:vitis_aie_sim:vitis_aie_x86sim', TOOLVERSION: '2021.2_stable_latest')
+FullVitisLibPipeline (branch: 'master', libname: 'Vitis_Libraries', TARGETS: 'hls_csim:hls_csynth:hls_cosim:hls_vivado_impl:vitis_sw_emu:vitis_hw_emu:vitis_hw_build:vitis_aie_sim:vitis_aie_x86sim', TOOLVERSION: '2021.2_released')
diff --git a/vision/L1/include/imgproc/xf_remap.hpp b/vision/L1/include/imgproc/xf_remap.hpp
index 97c29db33f..d7429c264e 100644
--- a/vision/L1/include/imgproc/xf_remap.hpp
+++ b/vision/L1/include/imgproc/xf_remap.hpp
@@ -254,15 +254,13 @@ void xFRemapLI(xf::cv::Mat<SRC_T, ROWS, COLS, NPC>& src,
                         if (store_row) {
                             // Store every 3rd row in a buffer
                             lineBuf[pl][(j / 2) - 1] = pixval[pl];
+                            if (i != 0) {
+                                bufUram[pl][((i - 1) / 2) % (WIN_ROW / 2)][(j / 2) - 1].range(71, 48) = pixval[pl];
+                            }
                         } else {
                             // Read the stored row and fill in
                             prev_pixval[pl] = lineBuf[pl][(j / 2) - 1];
-                        }
-
-                        if (i != 0) {
-                            if (store_row) {
-                                bufUram[pl][((i - 1) / 2) % (WIN_ROW / 2)][(j / 2) - 1].range(71, 48) = pixval[pl];
-                            } else {
+                            if (i != 0) {
                                 pixval_2[pl].range(23, 0) = prev_pixval[pl];
                                 pixval_2[pl].range(47, 24) = pixval[pl];
                                 bufUram[pl][((i - 1) / 2) % (WIN_ROW / 2)][(j / 2) - 1].range(47, 0) = pixval_2[pl];