closes GH-2