closes #2432