closes #2439