diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index de4066673f1964115720a6c8b552b4af3c57381c..1f707a76cb2918cef3bb109e56d61802e2b011ec 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -410,8 +410,8 @@ static int av1_pvq_decode_helper2(MACROBLOCKD *const xd,
     int seg_id = mbmi->segment_id;
     int16_t *quant;
     FWD_TXFM_PARAM fwd_txfm_param;
-    // ToDo(yaowu): figure out how to initialize this
-    int max_scan_line = 0;
+    // ToDo(yaowu): correct this with optimal number from decoding process.
+    const int max_scan_line = tx_size_2d[tx_size];
 
     for (j = 0; j < tx_blk_size; j++)
       for (i = 0; i < tx_blk_size; i++) {