closes #869