Fix buffering