Buffering fix