Newbuf fix