closes #1924