Ultimate fix for gh-693.