closes GH-13