closes #1735