closes #1956