Closes gh-124.