closes GH-82