Fix issue with latest teapot.