closes #818