Increasing robustness of buffering