Correctly buffer data.