2.1.2 fix buffer regression