This closes #854