buffering fix