closes #1742