Closes GH-68