Second attempt at buffering fix