closes #675