closes #2425