closes GH-54