closes #807