closes #680