closes #1813