A better mapping for killing buffers