[gh-674] Closes
#670
#670 (closed)