closes #1678