closes gh-2