closes #2483