closes #810