closes #795