clean up buffer recycle fix