closes #694