closes #1899