closes GH-12