closes #1680