[gh-597] Closes
#596
#596 (closed)