[gh-682] Closes
#681
#681 (closed)