This closes #831