closes #3586