closes #1572