This closes #873