This closes #859