closes #2051