[gh-714] Closes
#697
#697 (closed)