Buf fix #1