branch to fix struct buf
branch to fix struct buf