better handling of deleted buffers