[gh-589] Closes
#588
#588 (closed)