closes #2123