closes #2423