This closes #862