Minor improvement on TF buffer.