Closes #765

#765