closes #1615