[gh-693] Closes
#689
#689 (closed)