fix-buffer-use.diff
