closes #802