closes #2347