Closes #785

#785