Fix some buffered data coming as new data