Buf fixing