Buf Fix #18