Buffer mess fixed