closes #2067