closes #881