closes gh-183