Fix kill buffer to always work.