Overcome buffering issues

PLAT-692 #time 4h