closes #682