Closes GH-257