[gh-581] Closes
#580
#580 (closed)