Close gh-296