closes #695