[gh-713] Closes
#709
#709 (closed)