[gh-584] Closes
#582
#582 (closed)