closes #2391