closes #2368