closes #2481