gh-695

Initial fix for #695