closes #2157