gh-697

Closes #697