closes #3596