closes #856