closes #2488