Closes GH-22