closes #2354