closes #2073