closes #2370