closes #2089