Closes #786

#786