closes gh-279