closes #1769