closes #833