Teapot Fix for new buffer