Buf fix