Closes #794

#794