closes gh-528