closes #1880