closes #1926