closes #809