[gh-738] Closes
#737
#737 (closed)