closes gh-313