closes #2078