closes #1855