[gh-593] Closes
#592
#592 (closed)