closes gh-289