closes #1723