This closes #852