closes #1784