Fixing add to buffer expunge bug