Vin fix pair

fix the memory problem observed in production.
remove regression w.r.t. 6_2_0_pre4