Close gh-507