closes #1948