Closes #696

#696