closes GH-51, closes GH-64