buffer correctly