Closes GH-12