closes #1934