[gh-595] Closes
#586
#586 (closed)