closes #1894