[gh-560] Closes
#481
#481 (closed)