closes #688