[gh-630] Closes
#629
#629 (closed)