This closes #858