closes #681