closes #2035