Closes GH-71