Fix problem with buffer not properly cleaning up