[gh-602] Closes
#601
#601 (closed)