closes #698